[jboss-cvs] JBossAS SVN: r98516 - projects/javaee/tags/jboss-javaee-parent-6.0.0-alpha-1/jboss-el-api/src/main/javax/el.
jboss-cvs-commits at lists.jboss.org
jboss-cvs-commits at lists.jboss.org
Tue Dec 22 12:25:18 EST 2009
Author: jaikiran
Date: 2009-12-22 12:25:18 -0500 (Tue, 22 Dec 2009)
New Revision: 98516
Removed:
projects/javaee/tags/jboss-javaee-parent-6.0.0-alpha-1/jboss-el-api/src/main/javax/el/ELUtil.java
Log:
Autoversioning commit: a non-deltaV client made a change to
/projects/javaee/tags/jboss-javaee-parent-6.0.0-alpha-1/jboss-el-api/src/main/javax/el/ELUtil.java
Deleted: projects/javaee/tags/jboss-javaee-parent-6.0.0-alpha-1/jboss-el-api/src/main/javax/el/ELUtil.java
===================================================================
--- projects/javaee/tags/jboss-javaee-parent-6.0.0-alpha-1/jboss-el-api/src/main/javax/el/ELUtil.java 2009-12-22 17:25:10 UTC (rev 98515)
+++ projects/javaee/tags/jboss-javaee-parent-6.0.0-alpha-1/jboss-el-api/src/main/javax/el/ELUtil.java 2009-12-22 17:25:18 UTC (rev 98516)
@@ -1,206 +0,0 @@
-/*
- * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS HEADER.
- *
- * Copyright 1997-2008 Sun Microsystems, Inc. All rights reserved.
- *
- * The contents of this file are subject to the terms of either the GNU
- * General Public License Version 2 only ("GPL") or the Common Development
- * and Distribution License("CDDL") (collectively, the "License"). You
- * may not use this file except in compliance with the License. You can obtain
- * a copy of the License at https://glassfish.dev.java.net/public/CDDL+GPL.html
- * or glassfish/bootstrap/legal/LICENSE.txt. See the License for the specific
- * language governing permissions and limitations under the License.
- *
- * When distributing the software, include this License Header Notice in each
- * file and include the License file at glassfish/bootstrap/legal/LICENSE.txt.
- * Sun designates this particular file as subject to the "Classpath" exception
- * as provided by Sun in the GPL Version 2 section of the License file that
- * accompanied this code. If applicable, add the following below the License
- * Header, with the fields enclosed by brackets [] replaced by your own
- * identifying information: "Portions Copyrighted [year]
- * [name of copyright owner]"
- *
- * Contributor(s):
- *
- * If you wish your version of this file to be governed by only the CDDL or
- * only the GPL Version 2, indicate your decision by adding "[Contributor]
- * elects to include this software in this distribution under the [CDDL or GPL
- * Version 2] license." If you don't indicate a single choice of license, a
- * recipient has the option to distribute your version of this file under
- * either the CDDL, the GPL Version 2 or to extend the choice of license to
- * its licensees as provided above. However, if you add GPL Version 2 code
- * and therefore, elected the GPL Version 2 license, then the option applies
- * only if the new code is made subject to such option by the copyright
- * holder.
- *
- *
- * This file incorporates work covered by the following copyright and
- * permission notice:
- *
- * Copyright 2004 The Apache Software Foundation
- *
- * Licensed under the Apache License, Version 2.0 (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.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
- */
-
-package javax.el;
-
-import java.text.MessageFormat;
-import java.util.HashMap;
-import java.util.Locale;
-import java.util.Map;
-import java.util.MissingResourceException;
-import java.util.ResourceBundle;
-
-/**
- *
- * <p>Utility methods for this portion of the EL implementation</p>
- *
- * <p>Methods on this class use a Map instance stored in ThreadLocal storage
- * to minimize the performance impact on operations that take place multiple
- * times on a single Thread. The keys and values of the Map
- * are implementation private.</p>
- *
- * @author edburns
- */
-class ELUtil {
-
- /**
- * <p>This class may not be constructed.</p>
- */
-
- private ELUtil() {
- }
-
- /**
- * <p>The <code>ThreadLocal</code> variable used to record the
- * {@link javax.faces.context.FacesContext} instance for each
- * processing thread.</p>
- */
- private static ThreadLocal instance = new ThreadLocal() {
- protected Object initialValue() { return (null); }
- };
-
- /**
- * @return a Map stored in ThreadLocal storage. This may
- * be used by methods of this class to minimize the performance
- * impact for operations that may take place multiple times on a given
- * Thread instance.
- */
-
- private static Map getCurrentInstance() {
- Map result = (Map) instance.get();
- if (null == result) {
- result = new HashMap();
- setCurrentInstance(result);
- }
- return result;
-
- }
-
- /**
- * <p>Replace the Map with the argument context.</p>
- *
- * @param context the Map to be stored in ThreadLocal storage.
- */
-
- private static void setCurrentInstance(Map context) {
-
- instance.set(context);
-
- }
-
- /*
- * <p>Convenience method, calls through to
- * {@link #getExceptionMessageString(javax.el.ELContext,java.lang.String,Object []).
- * </p>
- *
- * @param context the ELContext from which the Locale for this message
- * is extracted.
- *
- * @param messageId the messageId String in the ResourceBundle
- *
- * @return a localized String for the argument messageId
- */
-
- public static String getExceptionMessageString(ELContext context, String messageId) {
- return getExceptionMessageString(context, messageId, null);
- }
-
- /*
- * <p>Return a Localized message String suitable for use as an Exception message.
- * Examine the argument <code>context</code> for a <code>Locale</code>. If
- * not present, use <code>Locale.getDefault()</code>. Load the
- * <code>ResourceBundle</code> "javax.el.Messages" using that locale. Get
- * the message string for argument <code>messageId</code>. If not found
- * return "Missing Resource in EL implementation ??? messageId ???"
- * with messageId substituted with the runtime
- * value of argument <code>messageId</code>. If found, and argument
- * <code>params</code> is non-null, format the message using the
- * params. If formatting fails, return a sensible message including
- * the <code>messageId</code>. If argument <code>params</code> is
- * <code>null</code>, skip formatting and return the message directly, otherwise
- * return the formatted message.</p>
- *
- * @param context the ELContext from which the Locale for this message
- * is extracted.
- *
- * @param messageId the messageId String in the ResourceBundle
- *
- * @param params parameters to the message
- *
- * @return a localized String for the argument messageId
- */
-
- public static String getExceptionMessageString(ELContext context,
- String messageId,
- Object [] params) {
- String result = "";
- Locale locale = null;
-
- if (null == context || null == messageId) {
- return result;
- }
-
- if (null == (locale = context.getLocale())) {
- locale = Locale.getDefault();
- }
- if (null != locale) {
- Map threadMap = getCurrentInstance();
- ResourceBundle rb = null;
- if (null == (rb = (ResourceBundle)
- threadMap.get(locale.toString()))) {
- rb = ResourceBundle.getBundle("javax.el.PrivateMessages",
- locale);
- threadMap.put(locale.toString(), rb);
- }
- if (null != rb) {
- try {
- result = rb.getString(messageId);
- if (null != params) {
- result = MessageFormat.format(result, params);
- }
- } catch (IllegalArgumentException iae) {
- result = "Can't get localized message: parameters to message appear to be incorrect. Message to format: " + messageId;
- } catch (MissingResourceException mre) {
- result = "Missing Resource in EL implementation: ???" + messageId + "???";
- } catch (Exception e) {
- result = "Exception resolving message in EL implementation: ???" + messageId + "???";
- }
- }
- }
-
- return result;
- }
-
-
-}
More information about the jboss-cvs-commits
mailing list