You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@myfaces.apache.org by mb...@apache.org on 2007/03/16 14:24:21 UTC
svn commit: r518967 [16/20] - in /myfaces/core/branches/jsf12:
api/src/main/java-templates/javax/faces/component/
api/src/main/java/javax/faces/application/
api/src/main/java/javax/faces/component/
api/src/main/java/javax/faces/context/ api/src/main/ja...
Modified: myfaces/core/branches/jsf12/impl/src/main/java/org/apache/myfaces/el/unified/resolver/ResourceBundleResolver.java
URL: http://svn.apache.org/viewvc/myfaces/core/branches/jsf12/impl/src/main/java/org/apache/myfaces/el/unified/resolver/ResourceBundleResolver.java?view=diff&rev=518967&r1=518966&r2=518967
==============================================================================
--- myfaces/core/branches/jsf12/impl/src/main/java/org/apache/myfaces/el/unified/resolver/ResourceBundleResolver.java (original)
+++ myfaces/core/branches/jsf12/impl/src/main/java/org/apache/myfaces/el/unified/resolver/ResourceBundleResolver.java Fri Mar 16 06:24:10 2007
@@ -1,137 +1,137 @@
-/*
- * Copyright 2006 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 org.apache.myfaces.el.unified.resolver;
-
-import java.beans.FeatureDescriptor;
-import java.util.Iterator;
-import java.util.ResourceBundle;
-import javax.el.ELContext;
-import javax.el.ELException;
-import javax.el.ELResolver;
-import javax.el.PropertyNotFoundException;
-import javax.el.PropertyNotWritableException;
-import javax.faces.application.Application;
-import javax.faces.context.FacesContext;
-
-/**
- * See JSF 1.2 spec section 5.6.1.4
- *
- * @author Stan Silvert
- */
-public class ResourceBundleResolver extends ELResolver {
-
- /** Creates a new instance of ResourceBundleResolver */
- public ResourceBundleResolver() {
- }
-
- public void setValue(ELContext context, Object base, Object property, Object value)
- throws NullPointerException, PropertyNotFoundException, PropertyNotWritableException, ELException {
-
- if ((base == null) && (property == null)) throw new PropertyNotFoundException();
-
- if (!(property instanceof String)) return;
-
- ResourceBundle bundle = getResourceBundle(context, (String)property);
-
- if (bundle != null) {
- throw new PropertyNotWritableException("ResourceBundles are read-only");
- }
- }
-
- public boolean isReadOnly(ELContext context, Object base, Object property)
- throws NullPointerException, PropertyNotFoundException, ELException {
-
- if (base != null) return false;
- if (property == null) throw new PropertyNotFoundException();
- if (!(property instanceof String)) return false;
-
- ResourceBundle bundle = getResourceBundle(context, (String)property);
-
- if (bundle != null) {
- context.setPropertyResolved(true);
- return true;
- }
-
- return false;
- }
-
- public Object getValue(ELContext context, Object base, Object property)
- throws NullPointerException, PropertyNotFoundException, ELException {
-
- if (base != null) return null;
- if (property == null) throw new PropertyNotFoundException();
- if (!(property instanceof String)) return null;
-
- ResourceBundle bundle = getResourceBundle(context, (String)property);
-
- if (bundle != null) {
- context.setPropertyResolved(true);
- return bundle;
- }
-
- return null;
- }
-
- public Class<?> getType(ELContext context, Object base, Object property)
- throws NullPointerException, PropertyNotFoundException, ELException {
-
- if (base != null) return null;
- if (property == null) throw new PropertyNotFoundException();
- if (!(property instanceof String)) return null;
-
- ResourceBundle bundle = getResourceBundle(context, (String)property);
-
- if (bundle != null) {
- context.setPropertyResolved(true);
- return ResourceBundle.class;
- }
-
- return null;
- }
-
- public Iterator<FeatureDescriptor> getFeatureDescriptors(ELContext context, Object base) {
-
- if (base != null) return null;
-
- // TODO fix this?
- // throw new UnsupportedOperationException("Can't implement without a list of all resource bundles??????");
- return null; // noop
- }
-
- public Class<?> getCommonPropertyType(ELContext context, Object base) {
-
- if (base != null) return null;
-
- return String.class;
- }
-
- // get the FacesContext from the ELContext
- private FacesContext facesContext(ELContext context) {
- return (FacesContext)context.getContext(FacesContext.class);
- }
-
- private ResourceBundle getResourceBundle(ELContext context, String property) {
- FacesContext facesContext = facesContext(context);
- if (facesContext != null) {
- Application application = facesContext.getApplication();
- return application.getResourceBundle(facesContext, property);
- }
-
- return null;
- }
-
-}
+/*
+ * Copyright 2006 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 org.apache.myfaces.el.unified.resolver;
+
+import java.beans.FeatureDescriptor;
+import java.util.Iterator;
+import java.util.ResourceBundle;
+import javax.el.ELContext;
+import javax.el.ELException;
+import javax.el.ELResolver;
+import javax.el.PropertyNotFoundException;
+import javax.el.PropertyNotWritableException;
+import javax.faces.application.Application;
+import javax.faces.context.FacesContext;
+
+/**
+ * See JSF 1.2 spec section 5.6.1.4
+ *
+ * @author Stan Silvert
+ */
+public class ResourceBundleResolver extends ELResolver {
+
+ /** Creates a new instance of ResourceBundleResolver */
+ public ResourceBundleResolver() {
+ }
+
+ public void setValue(ELContext context, Object base, Object property, Object value)
+ throws NullPointerException, PropertyNotFoundException, PropertyNotWritableException, ELException {
+
+ if ((base == null) && (property == null)) throw new PropertyNotFoundException();
+
+ if (!(property instanceof String)) return;
+
+ ResourceBundle bundle = getResourceBundle(context, (String)property);
+
+ if (bundle != null) {
+ throw new PropertyNotWritableException("ResourceBundles are read-only");
+ }
+ }
+
+ public boolean isReadOnly(ELContext context, Object base, Object property)
+ throws NullPointerException, PropertyNotFoundException, ELException {
+
+ if (base != null) return false;
+ if (property == null) throw new PropertyNotFoundException();
+ if (!(property instanceof String)) return false;
+
+ ResourceBundle bundle = getResourceBundle(context, (String)property);
+
+ if (bundle != null) {
+ context.setPropertyResolved(true);
+ return true;
+ }
+
+ return false;
+ }
+
+ public Object getValue(ELContext context, Object base, Object property)
+ throws NullPointerException, PropertyNotFoundException, ELException {
+
+ if (base != null) return null;
+ if (property == null) throw new PropertyNotFoundException();
+ if (!(property instanceof String)) return null;
+
+ ResourceBundle bundle = getResourceBundle(context, (String)property);
+
+ if (bundle != null) {
+ context.setPropertyResolved(true);
+ return bundle;
+ }
+
+ return null;
+ }
+
+ public Class<?> getType(ELContext context, Object base, Object property)
+ throws NullPointerException, PropertyNotFoundException, ELException {
+
+ if (base != null) return null;
+ if (property == null) throw new PropertyNotFoundException();
+ if (!(property instanceof String)) return null;
+
+ ResourceBundle bundle = getResourceBundle(context, (String)property);
+
+ if (bundle != null) {
+ context.setPropertyResolved(true);
+ return ResourceBundle.class;
+ }
+
+ return null;
+ }
+
+ public Iterator<FeatureDescriptor> getFeatureDescriptors(ELContext context, Object base) {
+
+ if (base != null) return null;
+
+ // TODO fix this?
+ // throw new UnsupportedOperationException("Can't implement without a list of all resource bundles??????");
+ return null; // noop
+ }
+
+ public Class<?> getCommonPropertyType(ELContext context, Object base) {
+
+ if (base != null) return null;
+
+ return String.class;
+ }
+
+ // get the FacesContext from the ELContext
+ private FacesContext facesContext(ELContext context) {
+ return (FacesContext)context.getContext(FacesContext.class);
+ }
+
+ private ResourceBundle getResourceBundle(ELContext context, String property) {
+ FacesContext facesContext = facesContext(context);
+ if (facesContext != null) {
+ Application application = facesContext.getApplication();
+ return application.getResourceBundle(facesContext, property);
+ }
+
+ return null;
+ }
+
+}
Propchange: myfaces/core/branches/jsf12/impl/src/main/java/org/apache/myfaces/el/unified/resolver/ResourceBundleResolver.java
------------------------------------------------------------------------------
svn:eol-style = native
Modified: myfaces/core/branches/jsf12/impl/src/main/java/org/apache/myfaces/el/unified/resolver/ScopedAttributeResolver.java
URL: http://svn.apache.org/viewvc/myfaces/core/branches/jsf12/impl/src/main/java/org/apache/myfaces/el/unified/resolver/ScopedAttributeResolver.java?view=diff&rev=518967&r1=518966&r2=518967
==============================================================================
--- myfaces/core/branches/jsf12/impl/src/main/java/org/apache/myfaces/el/unified/resolver/ScopedAttributeResolver.java (original)
+++ myfaces/core/branches/jsf12/impl/src/main/java/org/apache/myfaces/el/unified/resolver/ScopedAttributeResolver.java Fri Mar 16 06:24:10 2007
@@ -1,168 +1,168 @@
-/*
- * Copyright 2006 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 org.apache.myfaces.el.unified.resolver;
-
-import java.beans.FeatureDescriptor;
-import java.util.ArrayList;
-import java.util.Iterator;
-import java.util.List;
-import java.util.Map;
-
-import javax.el.ELContext;
-import javax.el.ELException;
-import javax.el.ELResolver;
-import javax.el.PropertyNotFoundException;
-import javax.el.PropertyNotWritableException;
-import javax.faces.context.ExternalContext;
-import javax.faces.context.FacesContext;
-
-/**
- * See JSF 1.2 spec section 5.6.2.7
- *
- * @author Stan Silvert
- */
-public class ScopedAttributeResolver extends ELResolver {
-
- /**
- * Creates a new instance of ScopedAttributeResolver
- */
- public ScopedAttributeResolver() {
- }
-
- public void setValue(ELContext context, Object base, Object property, Object value)
- throws NullPointerException, PropertyNotFoundException, PropertyNotWritableException, ELException {
-
- if (base != null) return;
- if (property == null) throw new PropertyNotFoundException();
-
- Map<String, Object> scopedMap = findScopedMap(externalContext(context), property);
- if (scopedMap != null) {
- scopedMap.put((String)property, value);
- } else {
- externalContext(context).getRequestMap().put((String)property, value);
- }
-
- context.setPropertyResolved(true);
- }
-
- public boolean isReadOnly(ELContext context, Object base, Object property)
- throws NullPointerException, PropertyNotFoundException, ELException {
-
- if (base == null) context.setPropertyResolved(true);
-
- return false;
- }
-
- public Object getValue(ELContext context, Object base, Object property)
- throws NullPointerException, PropertyNotFoundException, ELException {
-
- if (base != null) return null;
- if (property == null) throw new PropertyNotFoundException();
-
- Map scopedMap = findScopedMap(externalContext(context), property);
- if (scopedMap != null) {
- context.setPropertyResolved(true);
- return scopedMap.get(property);
- }
-
- return null;
- }
-
- public Class<?> getType(ELContext context, Object base, Object property)
- throws NullPointerException, PropertyNotFoundException, ELException {
-
- if (base != null) return null;
- if (property == null) throw new PropertyNotFoundException();
-
- context.setPropertyResolved(true);
- return Object.class;
- }
-
- public Iterator<FeatureDescriptor> getFeatureDescriptors(ELContext context, Object base) {
-
- if (base != null) return null;
-
- List<FeatureDescriptor> descriptorList = new ArrayList<FeatureDescriptor>();
- ExternalContext extContext = externalContext(context);
- addDescriptorsToList(descriptorList, extContext.getRequestMap());
- addDescriptorsToList(descriptorList, extContext.getSessionMap());
- addDescriptorsToList(descriptorList, extContext.getApplicationMap());
-
- return descriptorList.iterator();
- }
-
- public Class<?> getCommonPropertyType(ELContext context, Object base) {
-
- if (base != null) return null;
-
- return String.class;
- }
-
- // side effect: modifies the list
- private void addDescriptorsToList(List<FeatureDescriptor> descriptorList, Map scopeMap) {
- for (Object name: scopeMap.keySet()) {
- String strName = (String)name;
- Class runtimeType = scopeMap.get(strName).getClass();
- descriptorList.add(makeDescriptor(strName, runtimeType));
- }
- }
-
- private FeatureDescriptor makeDescriptor(String name, Class runtimeType) {
- FeatureDescriptor fd = new FeatureDescriptor();
- fd.setValue(ELResolver.RESOLVABLE_AT_DESIGN_TIME, Boolean.TRUE);
- fd.setValue(ELResolver.TYPE, runtimeType);
- fd.setName(name);
- fd.setDisplayName(name);
- fd.setShortDescription(name);
- fd.setExpert(false);
- fd.setHidden(false);
- fd.setPreferred(true);
- return fd;
- }
-
- // returns null if not found
- private Map<String, Object> findScopedMap(ExternalContext extContext, Object property) {
-
- if (extContext == null) return null;
-
- Map<String, Object> scopedMap = extContext.getRequestMap();
- if (scopedMap.containsKey(property)) return scopedMap;
-
- scopedMap = extContext.getSessionMap();
- if (scopedMap.containsKey(property)) return scopedMap;
-
- scopedMap = extContext.getApplicationMap();
- if (scopedMap.containsKey(property)) return scopedMap;
-
- return null;
- }
-
- // get the FacesContext from the ELContext
- private FacesContext facesContext(ELContext context) {
- return (FacesContext)context.getContext(FacesContext.class);
- }
-
- private ExternalContext externalContext(ELContext context) {
- FacesContext facesContext = facesContext(context);
- if (facesContext != null) {
- return facesContext(context).getExternalContext();
- }
-
- return null;
- }
-
-}
+/*
+ * Copyright 2006 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 org.apache.myfaces.el.unified.resolver;
+
+import java.beans.FeatureDescriptor;
+import java.util.ArrayList;
+import java.util.Iterator;
+import java.util.List;
+import java.util.Map;
+
+import javax.el.ELContext;
+import javax.el.ELException;
+import javax.el.ELResolver;
+import javax.el.PropertyNotFoundException;
+import javax.el.PropertyNotWritableException;
+import javax.faces.context.ExternalContext;
+import javax.faces.context.FacesContext;
+
+/**
+ * See JSF 1.2 spec section 5.6.2.7
+ *
+ * @author Stan Silvert
+ */
+public class ScopedAttributeResolver extends ELResolver {
+
+ /**
+ * Creates a new instance of ScopedAttributeResolver
+ */
+ public ScopedAttributeResolver() {
+ }
+
+ public void setValue(ELContext context, Object base, Object property, Object value)
+ throws NullPointerException, PropertyNotFoundException, PropertyNotWritableException, ELException {
+
+ if (base != null) return;
+ if (property == null) throw new PropertyNotFoundException();
+
+ Map<String, Object> scopedMap = findScopedMap(externalContext(context), property);
+ if (scopedMap != null) {
+ scopedMap.put((String)property, value);
+ } else {
+ externalContext(context).getRequestMap().put((String)property, value);
+ }
+
+ context.setPropertyResolved(true);
+ }
+
+ public boolean isReadOnly(ELContext context, Object base, Object property)
+ throws NullPointerException, PropertyNotFoundException, ELException {
+
+ if (base == null) context.setPropertyResolved(true);
+
+ return false;
+ }
+
+ public Object getValue(ELContext context, Object base, Object property)
+ throws NullPointerException, PropertyNotFoundException, ELException {
+
+ if (base != null) return null;
+ if (property == null) throw new PropertyNotFoundException();
+
+ Map scopedMap = findScopedMap(externalContext(context), property);
+ if (scopedMap != null) {
+ context.setPropertyResolved(true);
+ return scopedMap.get(property);
+ }
+
+ return null;
+ }
+
+ public Class<?> getType(ELContext context, Object base, Object property)
+ throws NullPointerException, PropertyNotFoundException, ELException {
+
+ if (base != null) return null;
+ if (property == null) throw new PropertyNotFoundException();
+
+ context.setPropertyResolved(true);
+ return Object.class;
+ }
+
+ public Iterator<FeatureDescriptor> getFeatureDescriptors(ELContext context, Object base) {
+
+ if (base != null) return null;
+
+ List<FeatureDescriptor> descriptorList = new ArrayList<FeatureDescriptor>();
+ ExternalContext extContext = externalContext(context);
+ addDescriptorsToList(descriptorList, extContext.getRequestMap());
+ addDescriptorsToList(descriptorList, extContext.getSessionMap());
+ addDescriptorsToList(descriptorList, extContext.getApplicationMap());
+
+ return descriptorList.iterator();
+ }
+
+ public Class<?> getCommonPropertyType(ELContext context, Object base) {
+
+ if (base != null) return null;
+
+ return String.class;
+ }
+
+ // side effect: modifies the list
+ private void addDescriptorsToList(List<FeatureDescriptor> descriptorList, Map scopeMap) {
+ for (Object name: scopeMap.keySet()) {
+ String strName = (String)name;
+ Class runtimeType = scopeMap.get(strName).getClass();
+ descriptorList.add(makeDescriptor(strName, runtimeType));
+ }
+ }
+
+ private FeatureDescriptor makeDescriptor(String name, Class runtimeType) {
+ FeatureDescriptor fd = new FeatureDescriptor();
+ fd.setValue(ELResolver.RESOLVABLE_AT_DESIGN_TIME, Boolean.TRUE);
+ fd.setValue(ELResolver.TYPE, runtimeType);
+ fd.setName(name);
+ fd.setDisplayName(name);
+ fd.setShortDescription(name);
+ fd.setExpert(false);
+ fd.setHidden(false);
+ fd.setPreferred(true);
+ return fd;
+ }
+
+ // returns null if not found
+ private Map<String, Object> findScopedMap(ExternalContext extContext, Object property) {
+
+ if (extContext == null) return null;
+
+ Map<String, Object> scopedMap = extContext.getRequestMap();
+ if (scopedMap.containsKey(property)) return scopedMap;
+
+ scopedMap = extContext.getSessionMap();
+ if (scopedMap.containsKey(property)) return scopedMap;
+
+ scopedMap = extContext.getApplicationMap();
+ if (scopedMap.containsKey(property)) return scopedMap;
+
+ return null;
+ }
+
+ // get the FacesContext from the ELContext
+ private FacesContext facesContext(ELContext context) {
+ return (FacesContext)context.getContext(FacesContext.class);
+ }
+
+ private ExternalContext externalContext(ELContext context) {
+ FacesContext facesContext = facesContext(context);
+ if (facesContext != null) {
+ return facesContext(context).getExternalContext();
+ }
+
+ return null;
+ }
+
+}
Propchange: myfaces/core/branches/jsf12/impl/src/main/java/org/apache/myfaces/el/unified/resolver/ScopedAttributeResolver.java
------------------------------------------------------------------------------
svn:eol-style = native
Modified: myfaces/core/branches/jsf12/impl/src/main/java/org/apache/myfaces/el/unified/resolver/implicitobject/ApplicationImplicitObject.java
URL: http://svn.apache.org/viewvc/myfaces/core/branches/jsf12/impl/src/main/java/org/apache/myfaces/el/unified/resolver/implicitobject/ApplicationImplicitObject.java?view=diff&rev=518967&r1=518966&r2=518967
==============================================================================
--- myfaces/core/branches/jsf12/impl/src/main/java/org/apache/myfaces/el/unified/resolver/implicitobject/ApplicationImplicitObject.java (original)
+++ myfaces/core/branches/jsf12/impl/src/main/java/org/apache/myfaces/el/unified/resolver/implicitobject/ApplicationImplicitObject.java Fri Mar 16 06:24:10 2007
@@ -1,53 +1,53 @@
-/*
- * Copyright 2006 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 org.apache.myfaces.el.unified.resolver.implicitobject;
-
-import java.beans.FeatureDescriptor;
-import javax.el.ELContext;
-
-/**
- * Encapsulates information needed by the ImplicitObjectResolver
- *
- * @author Stan Silvert
- */
-public class ApplicationImplicitObject extends ImplicitObject {
-
- private static final String NAME = "application".intern();
-
- /** Creates a new instance of ApplicationImplicitObject */
- public ApplicationImplicitObject() {
- }
-
- public Object getValue(ELContext context) {
- return externalContext(context).getContext();
- }
-
- public String getName() {
- return NAME;
- }
-
- public Class getType() {
- return null;
- }
-
- public FeatureDescriptor getDescriptor() {
- return makeDescriptor(NAME,
- "Represents the application environment",
- Object.class);
- }
-
-}
+/*
+ * Copyright 2006 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 org.apache.myfaces.el.unified.resolver.implicitobject;
+
+import java.beans.FeatureDescriptor;
+import javax.el.ELContext;
+
+/**
+ * Encapsulates information needed by the ImplicitObjectResolver
+ *
+ * @author Stan Silvert
+ */
+public class ApplicationImplicitObject extends ImplicitObject {
+
+ private static final String NAME = "application".intern();
+
+ /** Creates a new instance of ApplicationImplicitObject */
+ public ApplicationImplicitObject() {
+ }
+
+ public Object getValue(ELContext context) {
+ return externalContext(context).getContext();
+ }
+
+ public String getName() {
+ return NAME;
+ }
+
+ public Class getType() {
+ return null;
+ }
+
+ public FeatureDescriptor getDescriptor() {
+ return makeDescriptor(NAME,
+ "Represents the application environment",
+ Object.class);
+ }
+
+}
Propchange: myfaces/core/branches/jsf12/impl/src/main/java/org/apache/myfaces/el/unified/resolver/implicitobject/ApplicationImplicitObject.java
------------------------------------------------------------------------------
svn:eol-style = native
Modified: myfaces/core/branches/jsf12/impl/src/main/java/org/apache/myfaces/el/unified/resolver/implicitobject/ApplicationScopeImplicitObject.java
URL: http://svn.apache.org/viewvc/myfaces/core/branches/jsf12/impl/src/main/java/org/apache/myfaces/el/unified/resolver/implicitobject/ApplicationScopeImplicitObject.java?view=diff&rev=518967&r1=518966&r2=518967
==============================================================================
--- myfaces/core/branches/jsf12/impl/src/main/java/org/apache/myfaces/el/unified/resolver/implicitobject/ApplicationScopeImplicitObject.java (original)
+++ myfaces/core/branches/jsf12/impl/src/main/java/org/apache/myfaces/el/unified/resolver/implicitobject/ApplicationScopeImplicitObject.java Fri Mar 16 06:24:10 2007
@@ -1,54 +1,54 @@
-/*
- * Copyright 2006 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 org.apache.myfaces.el.unified.resolver.implicitobject;
-
-import java.beans.FeatureDescriptor;
-import java.util.Map;
-import javax.el.ELContext;
-
-/**
- * Encapsulates information needed by the ImplicitObjectResolver
- *
- * @author Stan Silvert
- */
-public class ApplicationScopeImplicitObject extends ImplicitObject {
-
- private static final String NAME = "applicationScope".intern();
-
- /** Creates a new instance of ApplicationScopeImplicitObject */
- public ApplicationScopeImplicitObject() {
- }
-
- public Object getValue(ELContext context) {
- return externalContext(context).getApplicationMap();
- }
-
- public String getName() {
- return NAME;
- }
-
- public Class getType() {
- return Object.class;
- }
-
- public FeatureDescriptor getDescriptor() {
- return makeDescriptor(NAME,
- "Application scope attributes",
- Map.class);
- }
-
-}
+/*
+ * Copyright 2006 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 org.apache.myfaces.el.unified.resolver.implicitobject;
+
+import java.beans.FeatureDescriptor;
+import java.util.Map;
+import javax.el.ELContext;
+
+/**
+ * Encapsulates information needed by the ImplicitObjectResolver
+ *
+ * @author Stan Silvert
+ */
+public class ApplicationScopeImplicitObject extends ImplicitObject {
+
+ private static final String NAME = "applicationScope".intern();
+
+ /** Creates a new instance of ApplicationScopeImplicitObject */
+ public ApplicationScopeImplicitObject() {
+ }
+
+ public Object getValue(ELContext context) {
+ return externalContext(context).getApplicationMap();
+ }
+
+ public String getName() {
+ return NAME;
+ }
+
+ public Class getType() {
+ return Object.class;
+ }
+
+ public FeatureDescriptor getDescriptor() {
+ return makeDescriptor(NAME,
+ "Application scope attributes",
+ Map.class);
+ }
+
+}
Propchange: myfaces/core/branches/jsf12/impl/src/main/java/org/apache/myfaces/el/unified/resolver/implicitobject/ApplicationScopeImplicitObject.java
------------------------------------------------------------------------------
svn:eol-style = native
Modified: myfaces/core/branches/jsf12/impl/src/main/java/org/apache/myfaces/el/unified/resolver/implicitobject/CookieImplicitObject.java
URL: http://svn.apache.org/viewvc/myfaces/core/branches/jsf12/impl/src/main/java/org/apache/myfaces/el/unified/resolver/implicitobject/CookieImplicitObject.java?view=diff&rev=518967&r1=518966&r2=518967
==============================================================================
--- myfaces/core/branches/jsf12/impl/src/main/java/org/apache/myfaces/el/unified/resolver/implicitobject/CookieImplicitObject.java (original)
+++ myfaces/core/branches/jsf12/impl/src/main/java/org/apache/myfaces/el/unified/resolver/implicitobject/CookieImplicitObject.java Fri Mar 16 06:24:10 2007
@@ -1,54 +1,54 @@
-/*
- * Copyright 2006 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 org.apache.myfaces.el.unified.resolver.implicitobject;
-
-import java.beans.FeatureDescriptor;
-import java.util.Map;
-import javax.el.ELContext;
-
-/**
- * Encapsulates information needed by the ImplicitObjectResolver
- *
- * @author Stan Silvert
- */
-public class CookieImplicitObject extends ImplicitObject {
-
- private static final String NAME = "cookie".intern();
-
- /** Creates a new instance of CookieImplicitObject */
- public CookieImplicitObject() {
- }
-
- public Object getValue(ELContext context) {
- return externalContext(context).getRequestCookieMap();
- }
-
- public String getName() {
- return NAME;
- }
-
- public Class getType() {
- return null;
- }
-
- public FeatureDescriptor getDescriptor() {
- return makeDescriptor(NAME,
- "Map whose keys are a set of cookie names in the current request",
- Map.class);
- }
-
-}
+/*
+ * Copyright 2006 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 org.apache.myfaces.el.unified.resolver.implicitobject;
+
+import java.beans.FeatureDescriptor;
+import java.util.Map;
+import javax.el.ELContext;
+
+/**
+ * Encapsulates information needed by the ImplicitObjectResolver
+ *
+ * @author Stan Silvert
+ */
+public class CookieImplicitObject extends ImplicitObject {
+
+ private static final String NAME = "cookie".intern();
+
+ /** Creates a new instance of CookieImplicitObject */
+ public CookieImplicitObject() {
+ }
+
+ public Object getValue(ELContext context) {
+ return externalContext(context).getRequestCookieMap();
+ }
+
+ public String getName() {
+ return NAME;
+ }
+
+ public Class getType() {
+ return null;
+ }
+
+ public FeatureDescriptor getDescriptor() {
+ return makeDescriptor(NAME,
+ "Map whose keys are a set of cookie names in the current request",
+ Map.class);
+ }
+
+}
Propchange: myfaces/core/branches/jsf12/impl/src/main/java/org/apache/myfaces/el/unified/resolver/implicitobject/CookieImplicitObject.java
------------------------------------------------------------------------------
svn:eol-style = native
Modified: myfaces/core/branches/jsf12/impl/src/main/java/org/apache/myfaces/el/unified/resolver/implicitobject/FacesContextImplicitObject.java
URL: http://svn.apache.org/viewvc/myfaces/core/branches/jsf12/impl/src/main/java/org/apache/myfaces/el/unified/resolver/implicitobject/FacesContextImplicitObject.java?view=diff&rev=518967&r1=518966&r2=518967
==============================================================================
--- myfaces/core/branches/jsf12/impl/src/main/java/org/apache/myfaces/el/unified/resolver/implicitobject/FacesContextImplicitObject.java (original)
+++ myfaces/core/branches/jsf12/impl/src/main/java/org/apache/myfaces/el/unified/resolver/implicitobject/FacesContextImplicitObject.java Fri Mar 16 06:24:10 2007
@@ -1,54 +1,54 @@
-/*
- * Copyright 2006 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 org.apache.myfaces.el.unified.resolver.implicitobject;
-
-import java.beans.FeatureDescriptor;
-import javax.el.ELContext;
-import javax.faces.context.FacesContext;
-
-/**
- * Encapsulates information needed by the ImplicitObjectResolver
- *
- * @author Stan Silvert
- */
-public class FacesContextImplicitObject extends ImplicitObject {
-
- private static final String NAME = "facesContext".intern();
-
- /** Creates a new instance of FacesContextImplicitObject */
- public FacesContextImplicitObject() {
- }
-
- public String getName() {
- return NAME;
- }
-
- public Object getValue(ELContext context) {
- return facesContext(context);
- }
-
- public Class getType() {
- return null;
- }
-
- public FeatureDescriptor getDescriptor() {
- return makeDescriptor(NAME,
- "Per-request information for a JSF request",
- FacesContext.class);
- }
-
-}
+/*
+ * Copyright 2006 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 org.apache.myfaces.el.unified.resolver.implicitobject;
+
+import java.beans.FeatureDescriptor;
+import javax.el.ELContext;
+import javax.faces.context.FacesContext;
+
+/**
+ * Encapsulates information needed by the ImplicitObjectResolver
+ *
+ * @author Stan Silvert
+ */
+public class FacesContextImplicitObject extends ImplicitObject {
+
+ private static final String NAME = "facesContext".intern();
+
+ /** Creates a new instance of FacesContextImplicitObject */
+ public FacesContextImplicitObject() {
+ }
+
+ public String getName() {
+ return NAME;
+ }
+
+ public Object getValue(ELContext context) {
+ return facesContext(context);
+ }
+
+ public Class getType() {
+ return null;
+ }
+
+ public FeatureDescriptor getDescriptor() {
+ return makeDescriptor(NAME,
+ "Per-request information for a JSF request",
+ FacesContext.class);
+ }
+
+}
Propchange: myfaces/core/branches/jsf12/impl/src/main/java/org/apache/myfaces/el/unified/resolver/implicitobject/FacesContextImplicitObject.java
------------------------------------------------------------------------------
svn:eol-style = native
Modified: myfaces/core/branches/jsf12/impl/src/main/java/org/apache/myfaces/el/unified/resolver/implicitobject/HeaderImplicitObject.java
URL: http://svn.apache.org/viewvc/myfaces/core/branches/jsf12/impl/src/main/java/org/apache/myfaces/el/unified/resolver/implicitobject/HeaderImplicitObject.java?view=diff&rev=518967&r1=518966&r2=518967
==============================================================================
--- myfaces/core/branches/jsf12/impl/src/main/java/org/apache/myfaces/el/unified/resolver/implicitobject/HeaderImplicitObject.java (original)
+++ myfaces/core/branches/jsf12/impl/src/main/java/org/apache/myfaces/el/unified/resolver/implicitobject/HeaderImplicitObject.java Fri Mar 16 06:24:10 2007
@@ -1,54 +1,54 @@
-/*
- * Copyright 2006 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 org.apache.myfaces.el.unified.resolver.implicitobject;
-
-import java.beans.FeatureDescriptor;
-import java.util.Map;
-import javax.el.ELContext;
-
-/**
- * Encapsulates information needed by the ImplicitObjectResolver
- *
- * @author Stan Silvert
- */
-public class HeaderImplicitObject extends ImplicitObject {
-
- private static final String NAME = "header".intern();
-
- /** Creates a new instance of HeaderImplicitObject */
- public HeaderImplicitObject() {
- }
-
- public Object getValue(ELContext context) {
- return externalContext(context).getRequestHeaderMap();
- }
-
- public String getName() {
- return NAME;
- }
-
- public Class getType() {
- return null;
- }
-
- public FeatureDescriptor getDescriptor() {
- return makeDescriptor(NAME,
- "Map whose keys are a set of request header names in the current request",
- Map.class);
- }
-
-}
+/*
+ * Copyright 2006 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 org.apache.myfaces.el.unified.resolver.implicitobject;
+
+import java.beans.FeatureDescriptor;
+import java.util.Map;
+import javax.el.ELContext;
+
+/**
+ * Encapsulates information needed by the ImplicitObjectResolver
+ *
+ * @author Stan Silvert
+ */
+public class HeaderImplicitObject extends ImplicitObject {
+
+ private static final String NAME = "header".intern();
+
+ /** Creates a new instance of HeaderImplicitObject */
+ public HeaderImplicitObject() {
+ }
+
+ public Object getValue(ELContext context) {
+ return externalContext(context).getRequestHeaderMap();
+ }
+
+ public String getName() {
+ return NAME;
+ }
+
+ public Class getType() {
+ return null;
+ }
+
+ public FeatureDescriptor getDescriptor() {
+ return makeDescriptor(NAME,
+ "Map whose keys are a set of request header names in the current request",
+ Map.class);
+ }
+
+}
Propchange: myfaces/core/branches/jsf12/impl/src/main/java/org/apache/myfaces/el/unified/resolver/implicitobject/HeaderImplicitObject.java
------------------------------------------------------------------------------
svn:eol-style = native
Modified: myfaces/core/branches/jsf12/impl/src/main/java/org/apache/myfaces/el/unified/resolver/implicitobject/HeaderValuesImplicitObject.java
URL: http://svn.apache.org/viewvc/myfaces/core/branches/jsf12/impl/src/main/java/org/apache/myfaces/el/unified/resolver/implicitobject/HeaderValuesImplicitObject.java?view=diff&rev=518967&r1=518966&r2=518967
==============================================================================
--- myfaces/core/branches/jsf12/impl/src/main/java/org/apache/myfaces/el/unified/resolver/implicitobject/HeaderValuesImplicitObject.java (original)
+++ myfaces/core/branches/jsf12/impl/src/main/java/org/apache/myfaces/el/unified/resolver/implicitobject/HeaderValuesImplicitObject.java Fri Mar 16 06:24:10 2007
@@ -1,54 +1,54 @@
-/*
- * Copyright 2006 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 org.apache.myfaces.el.unified.resolver.implicitobject;
-
-import java.beans.FeatureDescriptor;
-import java.util.Map;
-import javax.el.ELContext;
-
-/**
- * Encapsulates information needed by the ImplicitObjectResolver
- *
- * @author Stan Silvert
- */
-public class HeaderValuesImplicitObject extends ImplicitObject {
-
- private static final String NAME = "headerValues".intern();
-
- /** Creates a new instance of HeaderValuesImplicitObject */
- public HeaderValuesImplicitObject() {
- }
-
- public Object getValue(ELContext context) {
- return externalContext(context).getRequestHeaderValuesMap();
- }
-
- public String getName() {
- return NAME;
- }
-
- public Class getType() {
- return null;
- }
-
- public FeatureDescriptor getDescriptor() {
- return makeDescriptor(NAME,
- "Map whose keys are a set of request header names and whose values are all of the values (of type String[]) for each header name.",
- Map.class);
- }
-
-}
+/*
+ * Copyright 2006 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 org.apache.myfaces.el.unified.resolver.implicitobject;
+
+import java.beans.FeatureDescriptor;
+import java.util.Map;
+import javax.el.ELContext;
+
+/**
+ * Encapsulates information needed by the ImplicitObjectResolver
+ *
+ * @author Stan Silvert
+ */
+public class HeaderValuesImplicitObject extends ImplicitObject {
+
+ private static final String NAME = "headerValues".intern();
+
+ /** Creates a new instance of HeaderValuesImplicitObject */
+ public HeaderValuesImplicitObject() {
+ }
+
+ public Object getValue(ELContext context) {
+ return externalContext(context).getRequestHeaderValuesMap();
+ }
+
+ public String getName() {
+ return NAME;
+ }
+
+ public Class getType() {
+ return null;
+ }
+
+ public FeatureDescriptor getDescriptor() {
+ return makeDescriptor(NAME,
+ "Map whose keys are a set of request header names and whose values are all of the values (of type String[]) for each header name.",
+ Map.class);
+ }
+
+}
Propchange: myfaces/core/branches/jsf12/impl/src/main/java/org/apache/myfaces/el/unified/resolver/implicitobject/HeaderValuesImplicitObject.java
------------------------------------------------------------------------------
svn:eol-style = native
Modified: myfaces/core/branches/jsf12/impl/src/main/java/org/apache/myfaces/el/unified/resolver/implicitobject/ImplicitObject.java
URL: http://svn.apache.org/viewvc/myfaces/core/branches/jsf12/impl/src/main/java/org/apache/myfaces/el/unified/resolver/implicitobject/ImplicitObject.java?view=diff&rev=518967&r1=518966&r2=518967
==============================================================================
--- myfaces/core/branches/jsf12/impl/src/main/java/org/apache/myfaces/el/unified/resolver/implicitobject/ImplicitObject.java (original)
+++ myfaces/core/branches/jsf12/impl/src/main/java/org/apache/myfaces/el/unified/resolver/implicitobject/ImplicitObject.java Fri Mar 16 06:24:10 2007
@@ -1,72 +1,72 @@
-/*
- * Copyright 2006 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 org.apache.myfaces.el.unified.resolver.implicitobject;
-
-import java.beans.FeatureDescriptor;
-import javax.el.ELContext;
-import javax.el.ELResolver;
-import javax.faces.context.ExternalContext;
-import javax.faces.context.FacesContext;
-
-/**
- * Implementors of this class encapsulate the information needed to resolve
- * the implicit object.
- *
- * @author Stan Silvert
- */
-public abstract class ImplicitObject {
-
- public abstract Object getValue(ELContext context);
-
- public abstract FeatureDescriptor getDescriptor();
-
- /**
- * Returns an interned String representing the name of the
- * implicit object.
- */
- public abstract String getName();
-
- /**
- * Returns the most general type allowed for a future call to setValue()
- */
- public abstract Class getType();
-
- protected FeatureDescriptor makeDescriptor(String name,
- String description,
- Class elResolverType) {
- FeatureDescriptor fd = new FeatureDescriptor();
- fd.setValue(ELResolver.RESOLVABLE_AT_DESIGN_TIME, Boolean.TRUE);
- fd.setValue(ELResolver.TYPE, elResolverType);
- fd.setName(name);
- fd.setDisplayName(name);
- fd.setShortDescription(description);
- fd.setExpert(false);
- fd.setHidden(false);
- fd.setPreferred(true);
- return fd;
- }
-
- // get the FacesContext from the ELContext
- protected FacesContext facesContext(ELContext context) {
- return (FacesContext)context.getContext(FacesContext.class);
- }
-
- protected ExternalContext externalContext(ELContext context) {
- return facesContext(context).getExternalContext();
- }
-
-}
+/*
+ * Copyright 2006 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 org.apache.myfaces.el.unified.resolver.implicitobject;
+
+import java.beans.FeatureDescriptor;
+import javax.el.ELContext;
+import javax.el.ELResolver;
+import javax.faces.context.ExternalContext;
+import javax.faces.context.FacesContext;
+
+/**
+ * Implementors of this class encapsulate the information needed to resolve
+ * the implicit object.
+ *
+ * @author Stan Silvert
+ */
+public abstract class ImplicitObject {
+
+ public abstract Object getValue(ELContext context);
+
+ public abstract FeatureDescriptor getDescriptor();
+
+ /**
+ * Returns an interned String representing the name of the
+ * implicit object.
+ */
+ public abstract String getName();
+
+ /**
+ * Returns the most general type allowed for a future call to setValue()
+ */
+ public abstract Class getType();
+
+ protected FeatureDescriptor makeDescriptor(String name,
+ String description,
+ Class elResolverType) {
+ FeatureDescriptor fd = new FeatureDescriptor();
+ fd.setValue(ELResolver.RESOLVABLE_AT_DESIGN_TIME, Boolean.TRUE);
+ fd.setValue(ELResolver.TYPE, elResolverType);
+ fd.setName(name);
+ fd.setDisplayName(name);
+ fd.setShortDescription(description);
+ fd.setExpert(false);
+ fd.setHidden(false);
+ fd.setPreferred(true);
+ return fd;
+ }
+
+ // get the FacesContext from the ELContext
+ protected FacesContext facesContext(ELContext context) {
+ return (FacesContext)context.getContext(FacesContext.class);
+ }
+
+ protected ExternalContext externalContext(ELContext context) {
+ return facesContext(context).getExternalContext();
+ }
+
+}
Propchange: myfaces/core/branches/jsf12/impl/src/main/java/org/apache/myfaces/el/unified/resolver/implicitobject/ImplicitObject.java
------------------------------------------------------------------------------
svn:eol-style = native
Modified: myfaces/core/branches/jsf12/impl/src/main/java/org/apache/myfaces/el/unified/resolver/implicitobject/ImplicitObjectResolver.java
URL: http://svn.apache.org/viewvc/myfaces/core/branches/jsf12/impl/src/main/java/org/apache/myfaces/el/unified/resolver/implicitobject/ImplicitObjectResolver.java?view=diff&rev=518967&r1=518966&r2=518967
==============================================================================
--- myfaces/core/branches/jsf12/impl/src/main/java/org/apache/myfaces/el/unified/resolver/implicitobject/ImplicitObjectResolver.java (original)
+++ myfaces/core/branches/jsf12/impl/src/main/java/org/apache/myfaces/el/unified/resolver/implicitobject/ImplicitObjectResolver.java Fri Mar 16 06:24:10 2007
@@ -1,181 +1,181 @@
-/*
- * Copyright 2006 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 org.apache.myfaces.el.unified.resolver.implicitobject;
-
-import java.beans.FeatureDescriptor;
-import java.util.ArrayList;
-import java.util.Iterator;
-import java.util.List;
-
-import javax.el.ELContext;
-import javax.el.ELException;
-import javax.el.ELResolver;
-import javax.el.PropertyNotFoundException;
-import javax.el.PropertyNotWritableException;
-
-/**
- * See JSF 1.2 spec sections 5.6.1.1 and 5.6.2.1
- *
- * @author Stan Silvert
- */
-public class ImplicitObjectResolver extends ELResolver {
-
- private List<ImplicitObject> implicitObjects;
-
- /**
- * Static factory for an ELResolver for resolving implicit objects in JSPs.
- * See JSF 1.2 spec section 5.6.1.1
- */
- public static ELResolver makeResolverForJSP() {
- List<ImplicitObject> forJSPList = new ArrayList<ImplicitObject>(2);
- forJSPList.add(new FacesContextImplicitObject());
- forJSPList.add(new ViewImplicitObject());
- return new ImplicitObjectResolver(forJSPList);
- }
-
- /**
- * Static factory for an ELResolver for resolving implicit objects in all of Faces.
- * See JSF 1.2 spec section 5.6.1.2
- */
- public static ELResolver makeResolverForFaces() {
- List<ImplicitObject> forFacesList = new ArrayList<ImplicitObject>(14);
- forFacesList.add(new ApplicationImplicitObject());
- forFacesList.add(new ApplicationScopeImplicitObject());
- forFacesList.add(new CookieImplicitObject());
- forFacesList.add(new FacesContextImplicitObject());
- forFacesList.add(new HeaderImplicitObject());
- forFacesList.add(new HeaderValuesImplicitObject());
- forFacesList.add(new InitParamImplicitObject());
- forFacesList.add(new ParamImplicitObject());
- forFacesList.add(new ParamValuesImplicitObject());
- forFacesList.add(new RequestImplicitObject());
- forFacesList.add(new RequestScopeImplicitObject());
- forFacesList.add(new SessionImplicitObject());
- forFacesList.add(new SessionScopeImplicitObject());
- forFacesList.add(new ViewImplicitObject());
- return new ImplicitObjectResolver(forFacesList);
- }
-
-
- private ImplicitObjectResolver() {
- super();
- this.implicitObjects = new ArrayList<ImplicitObject>();
- }
-
- /** Creates a new instance of ImplicitObjectResolverForJSP */
- private ImplicitObjectResolver(List<ImplicitObject> implicitObjects) {
- this();
- this.implicitObjects = implicitObjects;
- }
-
- public void setValue(ELContext context, Object base, Object property, Object value)
- throws NullPointerException, PropertyNotFoundException, PropertyNotWritableException, ELException {
-
- if (base != null) return;
- if (property == null) throw new PropertyNotFoundException();
- if (!(property instanceof String)) return;
-
- String strProperty = castAndIntern(property);
-
- for (ImplicitObject obj: implicitObjects) {
- if (strProperty == obj.getName()) {
- throw new PropertyNotWritableException();
- }
- }
- }
-
- public boolean isReadOnly(ELContext context, Object base, Object property)
- throws NullPointerException, PropertyNotFoundException, ELException {
-
- if (base != null) return false;
- if (property == null) throw new PropertyNotFoundException();
- if (!(property instanceof String)) return false;
-
- String strProperty = castAndIntern(property);
-
- for (ImplicitObject obj: implicitObjects) {
- if (strProperty == obj.getName()) {
- context.setPropertyResolved(true);
- return true;
- }
- }
-
- return false;
- }
-
- public Object getValue(ELContext context, Object base, Object property)
- throws NullPointerException, PropertyNotFoundException, ELException {
-
- if (base != null) return null;
- if (property == null) throw new PropertyNotFoundException();
- if (!(property instanceof String)) return null;
-
- String strProperty = castAndIntern(property);
-
- for (ImplicitObject obj : implicitObjects) {
- if (strProperty == obj.getName()) {
- context.setPropertyResolved(true);
- return obj.getValue(context);
- }
- }
-
- return null;
- }
-
- public Class<?> getType(ELContext context, Object base, Object property)
- throws NullPointerException, PropertyNotFoundException, ELException {
-
- if (base != null) return null;
- if (property == null) throw new PropertyNotFoundException();
- if (!(property instanceof String)) return null;
-
- String strProperty = castAndIntern(property);
-
- for (ImplicitObject obj: implicitObjects) {
- if (strProperty == obj.getName()) {
- context.setPropertyResolved(true);
- return obj.getType();
- }
- }
-
- return null;
- }
-
- public Iterator<FeatureDescriptor> getFeatureDescriptors(ELContext context, Object base) {
- if (base != null) return null;
-
- ArrayList<FeatureDescriptor> descriptors = new ArrayList<FeatureDescriptor>(implicitObjects.size());
-
- for (ImplicitObject obj: implicitObjects) {
- descriptors.add(obj.getDescriptor());
- }
-
- return descriptors.iterator();
- }
-
- public Class<?> getCommonPropertyType(ELContext context, Object base) {
- if (base != null) return null;
-
- return String.class;
- }
-
- protected String castAndIntern(Object o) {
- String s = (String)o;
- return s.intern();
- }
-
+/*
+ * Copyright 2006 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 org.apache.myfaces.el.unified.resolver.implicitobject;
+
+import java.beans.FeatureDescriptor;
+import java.util.ArrayList;
+import java.util.Iterator;
+import java.util.List;
+
+import javax.el.ELContext;
+import javax.el.ELException;
+import javax.el.ELResolver;
+import javax.el.PropertyNotFoundException;
+import javax.el.PropertyNotWritableException;
+
+/**
+ * See JSF 1.2 spec sections 5.6.1.1 and 5.6.2.1
+ *
+ * @author Stan Silvert
+ */
+public class ImplicitObjectResolver extends ELResolver {
+
+ private List<ImplicitObject> implicitObjects;
+
+ /**
+ * Static factory for an ELResolver for resolving implicit objects in JSPs.
+ * See JSF 1.2 spec section 5.6.1.1
+ */
+ public static ELResolver makeResolverForJSP() {
+ List<ImplicitObject> forJSPList = new ArrayList<ImplicitObject>(2);
+ forJSPList.add(new FacesContextImplicitObject());
+ forJSPList.add(new ViewImplicitObject());
+ return new ImplicitObjectResolver(forJSPList);
+ }
+
+ /**
+ * Static factory for an ELResolver for resolving implicit objects in all of Faces.
+ * See JSF 1.2 spec section 5.6.1.2
+ */
+ public static ELResolver makeResolverForFaces() {
+ List<ImplicitObject> forFacesList = new ArrayList<ImplicitObject>(14);
+ forFacesList.add(new ApplicationImplicitObject());
+ forFacesList.add(new ApplicationScopeImplicitObject());
+ forFacesList.add(new CookieImplicitObject());
+ forFacesList.add(new FacesContextImplicitObject());
+ forFacesList.add(new HeaderImplicitObject());
+ forFacesList.add(new HeaderValuesImplicitObject());
+ forFacesList.add(new InitParamImplicitObject());
+ forFacesList.add(new ParamImplicitObject());
+ forFacesList.add(new ParamValuesImplicitObject());
+ forFacesList.add(new RequestImplicitObject());
+ forFacesList.add(new RequestScopeImplicitObject());
+ forFacesList.add(new SessionImplicitObject());
+ forFacesList.add(new SessionScopeImplicitObject());
+ forFacesList.add(new ViewImplicitObject());
+ return new ImplicitObjectResolver(forFacesList);
+ }
+
+
+ private ImplicitObjectResolver() {
+ super();
+ this.implicitObjects = new ArrayList<ImplicitObject>();
+ }
+
+ /** Creates a new instance of ImplicitObjectResolverForJSP */
+ private ImplicitObjectResolver(List<ImplicitObject> implicitObjects) {
+ this();
+ this.implicitObjects = implicitObjects;
+ }
+
+ public void setValue(ELContext context, Object base, Object property, Object value)
+ throws NullPointerException, PropertyNotFoundException, PropertyNotWritableException, ELException {
+
+ if (base != null) return;
+ if (property == null) throw new PropertyNotFoundException();
+ if (!(property instanceof String)) return;
+
+ String strProperty = castAndIntern(property);
+
+ for (ImplicitObject obj: implicitObjects) {
+ if (strProperty == obj.getName()) {
+ throw new PropertyNotWritableException();
+ }
+ }
+ }
+
+ public boolean isReadOnly(ELContext context, Object base, Object property)
+ throws NullPointerException, PropertyNotFoundException, ELException {
+
+ if (base != null) return false;
+ if (property == null) throw new PropertyNotFoundException();
+ if (!(property instanceof String)) return false;
+
+ String strProperty = castAndIntern(property);
+
+ for (ImplicitObject obj: implicitObjects) {
+ if (strProperty == obj.getName()) {
+ context.setPropertyResolved(true);
+ return true;
+ }
+ }
+
+ return false;
+ }
+
+ public Object getValue(ELContext context, Object base, Object property)
+ throws NullPointerException, PropertyNotFoundException, ELException {
+
+ if (base != null) return null;
+ if (property == null) throw new PropertyNotFoundException();
+ if (!(property instanceof String)) return null;
+
+ String strProperty = castAndIntern(property);
+
+ for (ImplicitObject obj : implicitObjects) {
+ if (strProperty == obj.getName()) {
+ context.setPropertyResolved(true);
+ return obj.getValue(context);
+ }
+ }
+
+ return null;
+ }
+
+ public Class<?> getType(ELContext context, Object base, Object property)
+ throws NullPointerException, PropertyNotFoundException, ELException {
+
+ if (base != null) return null;
+ if (property == null) throw new PropertyNotFoundException();
+ if (!(property instanceof String)) return null;
+
+ String strProperty = castAndIntern(property);
+
+ for (ImplicitObject obj: implicitObjects) {
+ if (strProperty == obj.getName()) {
+ context.setPropertyResolved(true);
+ return obj.getType();
+ }
+ }
+
+ return null;
+ }
+
+ public Iterator<FeatureDescriptor> getFeatureDescriptors(ELContext context, Object base) {
+ if (base != null) return null;
+
+ ArrayList<FeatureDescriptor> descriptors = new ArrayList<FeatureDescriptor>(implicitObjects.size());
+
+ for (ImplicitObject obj: implicitObjects) {
+ descriptors.add(obj.getDescriptor());
+ }
+
+ return descriptors.iterator();
+ }
+
+ public Class<?> getCommonPropertyType(ELContext context, Object base) {
+ if (base != null) return null;
+
+ return String.class;
+ }
+
+ protected String castAndIntern(Object o) {
+ String s = (String)o;
+ return s.intern();
+ }
+
}
Propchange: myfaces/core/branches/jsf12/impl/src/main/java/org/apache/myfaces/el/unified/resolver/implicitobject/ImplicitObjectResolver.java
------------------------------------------------------------------------------
svn:eol-style = native
Modified: myfaces/core/branches/jsf12/impl/src/main/java/org/apache/myfaces/el/unified/resolver/implicitobject/InitParamImplicitObject.java
URL: http://svn.apache.org/viewvc/myfaces/core/branches/jsf12/impl/src/main/java/org/apache/myfaces/el/unified/resolver/implicitobject/InitParamImplicitObject.java?view=diff&rev=518967&r1=518966&r2=518967
==============================================================================
--- myfaces/core/branches/jsf12/impl/src/main/java/org/apache/myfaces/el/unified/resolver/implicitobject/InitParamImplicitObject.java (original)
+++ myfaces/core/branches/jsf12/impl/src/main/java/org/apache/myfaces/el/unified/resolver/implicitobject/InitParamImplicitObject.java Fri Mar 16 06:24:10 2007
@@ -1,54 +1,54 @@
-/*
- * Copyright 2006 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 org.apache.myfaces.el.unified.resolver.implicitobject;
-
-import java.beans.FeatureDescriptor;
-import java.util.Map;
-import javax.el.ELContext;
-
-/**
- * Encapsulates information needed by the ImplicitObjectResolver
- *
- * @author Stan Silvert
- */
-public class InitParamImplicitObject extends ImplicitObject {
-
- private static final String NAME = "initParam".intern();
-
- /** Creates a new instance of InitParamImplicitObject */
- public InitParamImplicitObject() {
- }
-
- public Object getValue(ELContext context) {
- return externalContext(context).getInitParameterMap();
- }
-
- public String getName() {
- return NAME;
- }
-
- public Class getType() {
- return null;
- }
-
- public FeatureDescriptor getDescriptor() {
- return makeDescriptor(NAME,
- "Map whose keys are a set of application initialization param names and whose values are the corresponding values",
- Map.class);
- }
-
-}
+/*
+ * Copyright 2006 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 org.apache.myfaces.el.unified.resolver.implicitobject;
+
+import java.beans.FeatureDescriptor;
+import java.util.Map;
+import javax.el.ELContext;
+
+/**
+ * Encapsulates information needed by the ImplicitObjectResolver
+ *
+ * @author Stan Silvert
+ */
+public class InitParamImplicitObject extends ImplicitObject {
+
+ private static final String NAME = "initParam".intern();
+
+ /** Creates a new instance of InitParamImplicitObject */
+ public InitParamImplicitObject() {
+ }
+
+ public Object getValue(ELContext context) {
+ return externalContext(context).getInitParameterMap();
+ }
+
+ public String getName() {
+ return NAME;
+ }
+
+ public Class getType() {
+ return null;
+ }
+
+ public FeatureDescriptor getDescriptor() {
+ return makeDescriptor(NAME,
+ "Map whose keys are a set of application initialization param names and whose values are the corresponding values",
+ Map.class);
+ }
+
+}
Propchange: myfaces/core/branches/jsf12/impl/src/main/java/org/apache/myfaces/el/unified/resolver/implicitobject/InitParamImplicitObject.java
------------------------------------------------------------------------------
svn:eol-style = native
Modified: myfaces/core/branches/jsf12/impl/src/main/java/org/apache/myfaces/el/unified/resolver/implicitobject/ParamImplicitObject.java
URL: http://svn.apache.org/viewvc/myfaces/core/branches/jsf12/impl/src/main/java/org/apache/myfaces/el/unified/resolver/implicitobject/ParamImplicitObject.java?view=diff&rev=518967&r1=518966&r2=518967
==============================================================================
--- myfaces/core/branches/jsf12/impl/src/main/java/org/apache/myfaces/el/unified/resolver/implicitobject/ParamImplicitObject.java (original)
+++ myfaces/core/branches/jsf12/impl/src/main/java/org/apache/myfaces/el/unified/resolver/implicitobject/ParamImplicitObject.java Fri Mar 16 06:24:10 2007
@@ -1,54 +1,54 @@
-/*
- * Copyright 2006 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 org.apache.myfaces.el.unified.resolver.implicitobject;
-
-import java.beans.FeatureDescriptor;
-import java.util.Map;
-import javax.el.ELContext;
-
-/**
- * Encapsulates information needed by the ImplicitObjectResolver
- *
- * @author Stan Silvert
- */
-public class ParamImplicitObject extends ImplicitObject {
-
- private static final String NAME = "param".intern();
-
- /** Creates a new instance of InitParamImplicitObject */
- public ParamImplicitObject() {
- }
-
- public Object getValue(ELContext context) {
- return externalContext(context).getRequestParameterMap();
- }
-
- public String getName() {
- return NAME;
- }
-
- public Class getType() {
- return null;
- }
-
- public FeatureDescriptor getDescriptor() {
- return makeDescriptor(NAME,
- "Map whose keys are a set of request param names and whose values are the first (or only) values for each name in the request",
- Map.class);
- }
-
-}
+/*
+ * Copyright 2006 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 org.apache.myfaces.el.unified.resolver.implicitobject;
+
+import java.beans.FeatureDescriptor;
+import java.util.Map;
+import javax.el.ELContext;
+
+/**
+ * Encapsulates information needed by the ImplicitObjectResolver
+ *
+ * @author Stan Silvert
+ */
+public class ParamImplicitObject extends ImplicitObject {
+
+ private static final String NAME = "param".intern();
+
+ /** Creates a new instance of InitParamImplicitObject */
+ public ParamImplicitObject() {
+ }
+
+ public Object getValue(ELContext context) {
+ return externalContext(context).getRequestParameterMap();
+ }
+
+ public String getName() {
+ return NAME;
+ }
+
+ public Class getType() {
+ return null;
+ }
+
+ public FeatureDescriptor getDescriptor() {
+ return makeDescriptor(NAME,
+ "Map whose keys are a set of request param names and whose values are the first (or only) values for each name in the request",
+ Map.class);
+ }
+
+}
Propchange: myfaces/core/branches/jsf12/impl/src/main/java/org/apache/myfaces/el/unified/resolver/implicitobject/ParamImplicitObject.java
------------------------------------------------------------------------------
svn:eol-style = native
Modified: myfaces/core/branches/jsf12/impl/src/main/java/org/apache/myfaces/el/unified/resolver/implicitobject/ParamValuesImplicitObject.java
URL: http://svn.apache.org/viewvc/myfaces/core/branches/jsf12/impl/src/main/java/org/apache/myfaces/el/unified/resolver/implicitobject/ParamValuesImplicitObject.java?view=diff&rev=518967&r1=518966&r2=518967
==============================================================================
--- myfaces/core/branches/jsf12/impl/src/main/java/org/apache/myfaces/el/unified/resolver/implicitobject/ParamValuesImplicitObject.java (original)
+++ myfaces/core/branches/jsf12/impl/src/main/java/org/apache/myfaces/el/unified/resolver/implicitobject/ParamValuesImplicitObject.java Fri Mar 16 06:24:10 2007
@@ -1,54 +1,54 @@
-/*
- * Copyright 2006 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 org.apache.myfaces.el.unified.resolver.implicitobject;
-
-import java.beans.FeatureDescriptor;
-import java.util.Map;
-import javax.el.ELContext;
-
-/**
- * Encapsulates information needed by the ImplicitObjectResolver
- *
- * @author Stan Silvert
- */
-public class ParamValuesImplicitObject extends ImplicitObject {
-
- private static final String NAME = "paramValues".intern();
-
- /** Creates a new instance of ParamValuesImplicitObject */
- public ParamValuesImplicitObject() {
- }
-
- public Object getValue(ELContext context) {
- return externalContext(context).getRequestParameterValuesMap();
- }
-
- public String getName() {
- return NAME;
- }
-
- public Class getType() {
- return null;
- }
-
- public FeatureDescriptor getDescriptor() {
- return makeDescriptor(NAME,
- "Map whose keys are a set of request param names and whose values (type String[]) are all values for each name in the request",
- Map.class);
- }
-
-}
+/*
+ * Copyright 2006 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 org.apache.myfaces.el.unified.resolver.implicitobject;
+
+import java.beans.FeatureDescriptor;
+import java.util.Map;
+import javax.el.ELContext;
+
+/**
+ * Encapsulates information needed by the ImplicitObjectResolver
+ *
+ * @author Stan Silvert
+ */
+public class ParamValuesImplicitObject extends ImplicitObject {
+
+ private static final String NAME = "paramValues".intern();
+
+ /** Creates a new instance of ParamValuesImplicitObject */
+ public ParamValuesImplicitObject() {
+ }
+
+ public Object getValue(ELContext context) {
+ return externalContext(context).getRequestParameterValuesMap();
+ }
+
+ public String getName() {
+ return NAME;
+ }
+
+ public Class getType() {
+ return null;
+ }
+
+ public FeatureDescriptor getDescriptor() {
+ return makeDescriptor(NAME,
+ "Map whose keys are a set of request param names and whose values (type String[]) are all values for each name in the request",
+ Map.class);
+ }
+
+}
Propchange: myfaces/core/branches/jsf12/impl/src/main/java/org/apache/myfaces/el/unified/resolver/implicitobject/ParamValuesImplicitObject.java
------------------------------------------------------------------------------
svn:eol-style = native
Modified: myfaces/core/branches/jsf12/impl/src/main/java/org/apache/myfaces/el/unified/resolver/implicitobject/RequestImplicitObject.java
URL: http://svn.apache.org/viewvc/myfaces/core/branches/jsf12/impl/src/main/java/org/apache/myfaces/el/unified/resolver/implicitobject/RequestImplicitObject.java?view=diff&rev=518967&r1=518966&r2=518967
==============================================================================
--- myfaces/core/branches/jsf12/impl/src/main/java/org/apache/myfaces/el/unified/resolver/implicitobject/RequestImplicitObject.java (original)
+++ myfaces/core/branches/jsf12/impl/src/main/java/org/apache/myfaces/el/unified/resolver/implicitobject/RequestImplicitObject.java Fri Mar 16 06:24:10 2007
@@ -1,53 +1,53 @@
-/*
- * Copyright 2006 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 org.apache.myfaces.el.unified.resolver.implicitobject;
-
-import java.beans.FeatureDescriptor;
-import javax.el.ELContext;
-
-/**
- * Encapsulates information needed by the ImplicitObjectResolver
- *
- * @author Stan Silvert
- */
-public class RequestImplicitObject extends ImplicitObject {
-
- private static final String NAME = "request".intern();
-
- /** Creates a new instance of ParamValueRequestImplicitObject */
- public RequestImplicitObject() {
- }
-
- public Object getValue(ELContext context) {
- return externalContext(context).getRequest();
- }
-
- public String getName() {
- return NAME;
- }
-
- public Class getType() {
- return null;
- }
-
- public FeatureDescriptor getDescriptor() {
- return makeDescriptor(NAME,
- "Environment-specific object instance for the current request",
- Object.class);
- }
-
-}
+/*
+ * Copyright 2006 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 org.apache.myfaces.el.unified.resolver.implicitobject;
+
+import java.beans.FeatureDescriptor;
+import javax.el.ELContext;
+
+/**
+ * Encapsulates information needed by the ImplicitObjectResolver
+ *
+ * @author Stan Silvert
+ */
+public class RequestImplicitObject extends ImplicitObject {
+
+ private static final String NAME = "request".intern();
+
+ /** Creates a new instance of ParamValueRequestImplicitObject */
+ public RequestImplicitObject() {
+ }
+
+ public Object getValue(ELContext context) {
+ return externalContext(context).getRequest();
+ }
+
+ public String getName() {
+ return NAME;
+ }
+
+ public Class getType() {
+ return null;
+ }
+
+ public FeatureDescriptor getDescriptor() {
+ return makeDescriptor(NAME,
+ "Environment-specific object instance for the current request",
+ Object.class);
+ }
+
+}
Propchange: myfaces/core/branches/jsf12/impl/src/main/java/org/apache/myfaces/el/unified/resolver/implicitobject/RequestImplicitObject.java
------------------------------------------------------------------------------
svn:eol-style = native