Commit
This commit does not belong to any branch on this repository, and may belong to a fork outside of the repository.
git-svn-id: http://anonsvn.jboss.org/repos/weld/ri/trunk@2793 1c488680-804c-0410-94cd-c6b725194a0e
- Loading branch information
Showing
8 changed files
with
263 additions
and
215 deletions.
There are no files selected for viewing
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
49 changes: 49 additions & 0 deletions
49
impl/src/main/java/org/jboss/webbeans/el/ForwardingELResolver.java
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change |
|---|---|---|
| @@ -0,0 +1,49 @@ | ||
| package org.jboss.webbeans.el; | ||
|
|
||
| import java.util.Iterator; | ||
|
|
||
| import javax.el.ELContext; | ||
| import javax.el.ELResolver; | ||
|
|
||
| public abstract class ForwardingELResolver extends ELResolver | ||
| { | ||
|
|
||
| protected abstract ELResolver delegate(); | ||
|
|
||
| @Override | ||
| public Class<?> getCommonPropertyType(ELContext context, Object base) | ||
| { | ||
| return delegate().getCommonPropertyType(context, base); | ||
| } | ||
|
|
||
| @Override | ||
| public Iterator<?> getFeatureDescriptors(ELContext context, Object base) | ||
| { | ||
| return delegate().getFeatureDescriptors(context, base); | ||
| } | ||
|
|
||
| @Override | ||
| public Class<?> getType(ELContext context, Object base, Object property) | ||
| { | ||
| return delegate().getType(context, base, property); | ||
| } | ||
|
|
||
| @Override | ||
| public Object getValue(ELContext context, Object base, Object property) | ||
| { | ||
| return delegate().getValue(context, base, property); | ||
| } | ||
|
|
||
| @Override | ||
| public boolean isReadOnly(ELContext context, Object base, Object property) | ||
| { | ||
| return delegate().isReadOnly(context, base, property); | ||
| } | ||
|
|
||
| @Override | ||
| public void setValue(ELContext context, Object base, Object property, Object value) | ||
| { | ||
| delegate().setValue(context, base, property, value); | ||
| } | ||
|
|
||
| } |
187 changes: 16 additions & 171 deletions
187
impl/src/main/java/org/jboss/webbeans/el/WebBeansELResolver.java
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change |
|---|---|---|
| @@ -1,171 +1,16 @@ | ||
| /* | ||
| * JBoss, Home of Professional Open Source | ||
| * Copyright 2008, Red Hat Middleware LLC, and individual contributors | ||
| * by the @authors tag. See the copyright.txt in the distribution for a | ||
| * full listing of individual contributors. | ||
| * | ||
| * 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.jboss.webbeans.el; | ||
|
|
||
| import java.beans.FeatureDescriptor; | ||
| import java.util.Iterator; | ||
|
|
||
| import javax.el.ELContext; | ||
| import javax.el.ELResolver; | ||
| import javax.inject.ExecutionException; | ||
|
|
||
| import org.jboss.webbeans.CurrentManager; | ||
| import org.jboss.webbeans.ManagerImpl; | ||
|
|
||
| /** | ||
| * An EL-resolver against the named beans | ||
| * | ||
| * @author Pete Muir | ||
| */ | ||
| public class WebBeansELResolver extends ELResolver | ||
| { | ||
|
|
||
| private static final class ValueHolder<T> | ||
| { | ||
|
|
||
| private T value; | ||
|
|
||
| public T getValue() | ||
| { | ||
| return value; | ||
| } | ||
|
|
||
| public void setValue(T value) | ||
| { | ||
| this.value = value; | ||
| } | ||
|
|
||
| } | ||
|
|
||
| /** | ||
| * @see javax.el.ELResolver#getCommonPropertyType(ELContext, Object) | ||
| */ | ||
| @Override | ||
| public Class<?> getCommonPropertyType(ELContext context, Object base) | ||
| { | ||
| return null; | ||
| } | ||
|
|
||
| /** | ||
| * @see javax.el.ELResolver#getFeatureDescriptors(ELContext, Object) | ||
| */ | ||
| @Override | ||
| public Iterator<FeatureDescriptor> getFeatureDescriptors(ELContext context, Object base) | ||
| { | ||
| return null; | ||
| } | ||
|
|
||
| /** | ||
| * @see javax.el.ELResolver#getType(ELContext, Object, Object) | ||
| */ | ||
| @Override | ||
| public Class<?> getType(ELContext context, Object base, Object property) | ||
| { | ||
| return null; | ||
| } | ||
|
|
||
| /** | ||
| * @see javax.el.ELResolver#getValue(ELContext, Object, Object) | ||
| */ | ||
| @Override | ||
| public Object getValue(ELContext context, Object base, Object property) | ||
| { | ||
| if (property != null) | ||
| { | ||
| final ManagerImpl manager = CurrentManager.rootManager().getCurrent(); | ||
| String propertyString = property.toString(); | ||
| Namespace namespace = null; | ||
| if (base == null) | ||
| { | ||
| if (manager.getRootNamespace().contains(propertyString)) | ||
| { | ||
| context.setPropertyResolved(true); | ||
| return manager.getRootNamespace().get(propertyString); | ||
| } | ||
| } | ||
| else if (base instanceof Namespace) | ||
| { | ||
| namespace = (Namespace) base; | ||
| // We're definitely the responsible party | ||
| context.setPropertyResolved(true); | ||
| if (namespace.contains(propertyString)) | ||
| { | ||
| // There is a child namespace | ||
| return namespace.get(propertyString); | ||
| } | ||
| } | ||
| else | ||
| { | ||
| // let the standard EL resolver chain handle the property | ||
| return null; | ||
| } | ||
| final String name; | ||
| if (namespace != null) | ||
| { | ||
| // Try looking in the manager for a bean | ||
| name = namespace.qualifyName(propertyString); | ||
| } | ||
| else | ||
| { | ||
| name = propertyString; | ||
| } | ||
| final ValueHolder<Object> holder = new ValueHolder<Object>(); | ||
| try | ||
| { | ||
| new RunInDependentContext() | ||
| { | ||
|
|
||
| @Override | ||
| protected void execute() throws Exception | ||
| { | ||
| holder.setValue(manager.getInstanceByName(name)); | ||
| } | ||
|
|
||
| }.run(); | ||
| } | ||
| catch (Exception e) | ||
| { | ||
| throw new ExecutionException("Error resolving property " + propertyString + " against base " + base, e); | ||
| } | ||
| if (holder.getValue() != null) | ||
| { | ||
| context.setPropertyResolved(true); | ||
| return holder.getValue(); | ||
| } | ||
| } | ||
| return null; | ||
| } | ||
|
|
||
| /** | ||
| * @see javax.el.ELResolver#isReadOnly(ELContext, Object, Object) | ||
| */ | ||
| @Override | ||
| public boolean isReadOnly(ELContext context, Object base, Object property) | ||
| { | ||
| return false; | ||
| } | ||
|
|
||
| /** | ||
| * @see javax.el.ELResolver#setValue(ELContext, Object, Object, Object) | ||
| */ | ||
| @Override | ||
| public void setValue(ELContext context, Object base, Object property, Object value) | ||
| { | ||
| } | ||
|
|
||
| } | ||
|
|
||
| package org.jboss.webbeans.el; | ||
|
|
||
| import javax.el.ELResolver; | ||
|
|
||
| import org.jboss.webbeans.CurrentManager; | ||
|
|
||
| public class WebBeansELResolver extends ForwardingELResolver | ||
| { | ||
|
|
||
| @Override | ||
| protected ELResolver delegate() | ||
| { | ||
| return CurrentManager.rootManager().getCurrent().getELResolver(); | ||
| } | ||
|
|
||
| } |
Oops, something went wrong.