From 98e2821b38a775737e42a2479a6bc65107210859 Mon Sep 17 00:00:00 2001 From: Elliot Kroo Date: Thu, 11 Mar 2010 15:21:30 -0800 Subject: reorganizing the first level of folders (trunk/branch folders are not the git way :) --- .../javascript/tools/ToolErrorReporter.java | 225 --------------------- 1 file changed, 225 deletions(-) delete mode 100644 trunk/infrastructure/rhino1_7R1/toolsrc/org/mozilla/javascript/tools/ToolErrorReporter.java (limited to 'trunk/infrastructure/rhino1_7R1/toolsrc/org/mozilla/javascript/tools/ToolErrorReporter.java') diff --git a/trunk/infrastructure/rhino1_7R1/toolsrc/org/mozilla/javascript/tools/ToolErrorReporter.java b/trunk/infrastructure/rhino1_7R1/toolsrc/org/mozilla/javascript/tools/ToolErrorReporter.java deleted file mode 100644 index 938f5f2..0000000 --- a/trunk/infrastructure/rhino1_7R1/toolsrc/org/mozilla/javascript/tools/ToolErrorReporter.java +++ /dev/null @@ -1,225 +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, 1998. - * - * 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 - * Kurt Westerfeld - * - * 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.tools; - -import org.mozilla.javascript.*; - -import java.text.MessageFormat; -import java.io.*; -import java.util.*; - -/** - * Error reporter for tools. - * - * Currently used by both the shell and the compiler. - */ -public class ToolErrorReporter implements ErrorReporter { - - public ToolErrorReporter(boolean reportWarnings) { - this(reportWarnings, System.err); - } - - public ToolErrorReporter(boolean reportWarnings, PrintStream err) { - this.reportWarnings = reportWarnings; - this.err = err; - } - - /** - * Look up the message corresponding to messageId in the - * org.mozilla.javascript.tools.shell.resources.Messages property file. - * For internationalization support. - */ - public static String getMessage(String messageId) { - return getMessage(messageId, (Object []) null); - } - - public static String getMessage(String messageId, String argument) { - Object[] args = { argument }; - return getMessage(messageId, args); - } - - public static String getMessage(String messageId, Object arg1, Object arg2) - { - Object[] args = { arg1, arg2 }; - return getMessage(messageId, args); - } - - public static String getMessage(String messageId, Object[] args) { - Context cx = Context.getCurrentContext(); - Locale locale = cx == null ? Locale.getDefault() : cx.getLocale(); - - // ResourceBundle does cacheing. - ResourceBundle rb = ResourceBundle.getBundle - ("org.mozilla.javascript.tools.resources.Messages", locale); - - String formatString; - try { - formatString = rb.getString(messageId); - } catch (java.util.MissingResourceException mre) { - throw new RuntimeException("no message resource found for message property " - + messageId); - } - - if (args == null) { - return formatString; - } else { - MessageFormat formatter = new MessageFormat(formatString); - return formatter.format(args); - } - } - - private static String getExceptionMessage(RhinoException ex) - { - String msg; - if (ex instanceof JavaScriptException) { - msg = getMessage("msg.uncaughtJSException", ex.details()); - } else if (ex instanceof EcmaError) { - msg = getMessage("msg.uncaughtEcmaError", ex.details()); - } else if (ex instanceof EvaluatorException) { - msg = ex.details(); - } else { - msg = ex.toString(); - } - return msg; - } - - public void warning(String message, String sourceName, int line, - String lineSource, int lineOffset) - { - if (!reportWarnings) - return; - reportErrorMessage(message, sourceName, line, lineSource, lineOffset, - true); - } - - public void error(String message, String sourceName, int line, - String lineSource, int lineOffset) - { - hasReportedErrorFlag = true; - reportErrorMessage(message, sourceName, line, lineSource, lineOffset, - false); - } - - public EvaluatorException runtimeError(String message, String sourceName, - int line, String lineSource, - int lineOffset) - { - return new EvaluatorException(message, sourceName, line, - lineSource, lineOffset); - } - - public boolean hasReportedError() { - return hasReportedErrorFlag; - } - - public boolean isReportingWarnings() { - return this.reportWarnings; - } - - public void setIsReportingWarnings(boolean reportWarnings) { - this.reportWarnings = reportWarnings; - } - - public static void reportException(ErrorReporter er, RhinoException ex) - { - if (er instanceof ToolErrorReporter) { - ((ToolErrorReporter)er).reportException(ex); - } else { - String msg = getExceptionMessage(ex); - er.error(msg, ex.sourceName(), ex.lineNumber(), - ex.lineSource(), ex.columnNumber()); - } - } - - public void reportException(RhinoException ex) - { - if (ex instanceof WrappedException) { - WrappedException we = (WrappedException)ex; - we.printStackTrace(err); - } else { - String lineSeparator = - SecurityUtilities.getSystemProperty("line.separator"); - String msg = getExceptionMessage(ex) + lineSeparator + - ex.getScriptStackTrace(); - reportErrorMessage(msg, ex.sourceName(), ex.lineNumber(), - ex.lineSource(), ex.columnNumber(), false); - } - } - - private void reportErrorMessage(String message, String sourceName, int line, - String lineSource, int lineOffset, - boolean justWarning) - { - if (line > 0) { - String lineStr = String.valueOf(line); - if (sourceName != null) { - Object[] args = { sourceName, lineStr, message }; - message = getMessage("msg.format3", args); - } else { - Object[] args = { lineStr, message }; - message = getMessage("msg.format2", args); - } - } else { - Object[] args = { message }; - message = getMessage("msg.format1", args); - } - if (justWarning) { - message = getMessage("msg.warning", message); - } - err.println(messagePrefix + message); - if (null != lineSource) { - err.println(messagePrefix + lineSource); - err.println(messagePrefix + buildIndicator(lineOffset)); - } - } - - private String buildIndicator(int offset){ - StringBuffer sb = new StringBuffer(); - for (int i = 0; i < offset-1; i++) - sb.append("."); - sb.append("^"); - return sb.toString(); - } - - private final String messagePrefix = "js: "; - private boolean hasReportedErrorFlag; - private boolean reportWarnings; - private PrintStream err; -} -- cgit v1.2.3-1-g7c22