Author: nickarls Date: 2008-10-27 09:48:18 -0400 (Mon, 27 Oct 2008) New Revision: 181 Added: ri/trunk/webbeans-ri/src/main/java/org/jboss/webbeans/contexts/PseudoContext.java Modified: ri/trunk/webbeans-ri/src/main/java/org/jboss/webbeans/contexts/DependentContext.java ri/trunk/webbeans-ri/src/main/java/org/jboss/webbeans/contexts/NormalContext.java Log: Adding PseudoContext at NormalContext level, making both abstract. Added DependentContext as implementation. Modified: ri/trunk/webbeans-ri/src/main/java/org/jboss/webbeans/contexts/DependentContext.java =================================================================== --- ri/trunk/webbeans-ri/src/main/java/org/jboss/webbeans/contexts/DependentContext.java 2008-10-27 13:16:13 UTC (rev 180) +++ ri/trunk/webbeans-ri/src/main/java/org/jboss/webbeans/contexts/DependentContext.java 2008-10-27 13:48:18 UTC (rev 181) @@ -2,12 +2,20 @@ import java.lang.annotation.Annotation; -public class DependentContext extends AbstractContext +import javax.webbeans.Dependent; + +public class DependentContext extends PseudoContext { public DependentContext(Class<? extends Annotation> scopeType) { - super(scopeType); + super(Dependent.class); } + @Override + public String toString() + { + return "Dependent context"; + } + } Modified: ri/trunk/webbeans-ri/src/main/java/org/jboss/webbeans/contexts/NormalContext.java =================================================================== --- ri/trunk/webbeans-ri/src/main/java/org/jboss/webbeans/contexts/NormalContext.java 2008-10-27 13:16:13 UTC (rev 180) +++ ri/trunk/webbeans-ri/src/main/java/org/jboss/webbeans/contexts/NormalContext.java 2008-10-27 13:48:18 UTC (rev 181) @@ -2,7 +2,7 @@ import java.lang.annotation.Annotation; -public class NormalContext extends AbstractContext +public abstract class NormalContext extends AbstractContext { public NormalContext(Class<? extends Annotation> scopeType) Copied: ri/trunk/webbeans-ri/src/main/java/org/jboss/webbeans/contexts/PseudoContext.java (from rev 180, ri/trunk/webbeans-ri/src/main/java/org/jboss/webbeans/contexts/DependentContext.java) =================================================================== --- ri/trunk/webbeans-ri/src/main/java/org/jboss/webbeans/contexts/PseudoContext.java (rev 0) +++ ri/trunk/webbeans-ri/src/main/java/org/jboss/webbeans/contexts/PseudoContext.java 2008-10-27 13:48:18 UTC (rev 181) @@ -0,0 +1,13 @@ +package org.jboss.webbeans.contexts; + +import java.lang.annotation.Annotation; + +public abstract class PseudoContext extends AbstractContext +{ + + public PseudoContext(Class<? extends Annotation> scopeType) + { + super(scopeType); + } + +} Property changes on: ri/trunk/webbeans-ri/src/main/java/org/jboss/webbeans/contexts/PseudoContext.java ___________________________________________________________________ Name: svn:mergeinfo +