diff options
author | Egil Moeller <egil.moller@freecode.no> | 2010-03-22 00:16:53 +0100 |
---|---|---|
committer | Egil Moeller <egil.moller@freecode.no> | 2010-03-22 00:16:53 +0100 |
commit | fc00cfedd6c25d1634a1e0d28a7b7bc5f42e1cd7 (patch) | |
tree | 928419d6bfe794865e4b8f0634bd792f795c4b8a /trunk/infrastructure/rhino1_7R1/src/org/mozilla/javascript/DefaultErrorReporter.java | |
parent | 0fdab3db005c4fa31fb8306b573c0b35073d3e56 (diff) | |
parent | d56b9b3b82cdebcaeb00eec0fcb4326ad21adaa8 (diff) | |
download | etherpad-fc00cfedd6c25d1634a1e0d28a7b7bc5f42e1cd7.tar.gz etherpad-fc00cfedd6c25d1634a1e0d28a7b7bc5f42e1cd7.tar.xz etherpad-fc00cfedd6c25d1634a1e0d28a7b7bc5f42e1cd7.zip |
Merge branch 'master' into plugin-framework
Diffstat (limited to 'trunk/infrastructure/rhino1_7R1/src/org/mozilla/javascript/DefaultErrorReporter.java')
-rw-r--r-- | trunk/infrastructure/rhino1_7R1/src/org/mozilla/javascript/DefaultErrorReporter.java | 113 |
1 files changed, 0 insertions, 113 deletions
diff --git a/trunk/infrastructure/rhino1_7R1/src/org/mozilla/javascript/DefaultErrorReporter.java b/trunk/infrastructure/rhino1_7R1/src/org/mozilla/javascript/DefaultErrorReporter.java deleted file mode 100644 index c7d93d4..0000000 --- a/trunk/infrastructure/rhino1_7R1/src/org/mozilla/javascript/DefaultErrorReporter.java +++ /dev/null @@ -1,113 +0,0 @@ -/* -*- Mode: java; tab-width: 8; indent-tabs-mode: nil; c-basic-offset: 4 -*- - * - * ***** BEGIN LICENSE BLOCK ***** - * Version: MPL 1.1/GPL 2.0 - * - * The contents of this file are subject to the Mozilla Public License Version - * 1.1 (the "License"); you may not use this file except in compliance with - * the License. You may obtain a copy of the License at - * http://www.mozilla.org/MPL/ - * - * Software distributed under the License is distributed on an "AS IS" basis, - * WITHOUT WARRANTY OF ANY KIND, either express or implied. See the License - * for the specific language governing rights and limitations under the - * License. - * - * The Original Code is Rhino code, released - * May 6, 1999. - * - * The Initial Developer of the Original Code is - * Netscape Communications Corporation. - * Portions created by the Initial Developer are Copyright (C) 1997-1999 - * the Initial Developer. All Rights Reserved. - * - * Contributor(s): - * Norris Boyd - * - * Alternatively, the contents of this file may be used under the terms of - * the GNU General Public License Version 2 or later (the "GPL"), in which - * case the provisions of the GPL are applicable instead of those above. If - * you wish to allow use of your version of this file only under the terms of - * the GPL and not to allow others to use your version of this file under the - * MPL, indicate your decision by deleting the provisions above and replacing - * them with the notice and other provisions required by the GPL. If you do - * not delete the provisions above, a recipient may use your version of this - * file under either the MPL or the GPL. - * - * ***** END LICENSE BLOCK ***** */ - -package org.mozilla.javascript; - -/** - * This is the default error reporter for JavaScript. - * - * @author Norris Boyd - */ -class DefaultErrorReporter implements ErrorReporter -{ - static final DefaultErrorReporter instance = new DefaultErrorReporter(); - - private boolean forEval; - private ErrorReporter chainedReporter; - - private DefaultErrorReporter() { } - - static ErrorReporter forEval(ErrorReporter reporter) - { - DefaultErrorReporter r = new DefaultErrorReporter(); - r.forEval = true; - r.chainedReporter = reporter; - return r; - } - - public void warning(String message, String sourceURI, int line, - String lineText, int lineOffset) - { - if (chainedReporter != null) { - chainedReporter.warning( - message, sourceURI, line, lineText, lineOffset); - } else { - // Do nothing - } - } - - public void error(String message, String sourceURI, int line, - String lineText, int lineOffset) - { - if (forEval) { - // Assume error message strings that start with "TypeError: " - // should become TypeError exceptions. A bit of a hack, but we - // don't want to change the ErrorReporter interface. - String error = "SyntaxError"; - final String TYPE_ERROR_NAME = "TypeError"; - final String DELIMETER = ": "; - final String prefix = TYPE_ERROR_NAME + DELIMETER; - if (message.startsWith(prefix)) { - error = TYPE_ERROR_NAME; - message = message.substring(prefix.length()); - } - throw ScriptRuntime.constructError(error, message, sourceURI, - line, lineText, lineOffset); - } - if (chainedReporter != null) { - chainedReporter.error( - message, sourceURI, line, lineText, lineOffset); - } else { - throw runtimeError( - message, sourceURI, line, lineText, lineOffset); - } - } - - public EvaluatorException runtimeError(String message, String sourceURI, - int line, String lineText, - int lineOffset) - { - if (chainedReporter != null) { - return chainedReporter.runtimeError( - message, sourceURI, line, lineText, lineOffset); - } else { - return new EvaluatorException( - message, sourceURI, line, lineText, lineOffset); - } - } -} |