[webbeans-commits] Webbeans SVN: r1625 - ri/trunk/webbeans-ri/src/main/java/org/jboss/webbeans/bean.

[webbeans-commits at lists.jboss.org]

Author: pete.muir at jboss.org
Date: 2009-02-21 18:16:05 -0500 (Sat, 21 Feb 2009)
New Revision: 1625

Modified:
   ri/trunk/webbeans-ri/src/main/java/org/jboss/webbeans/bean/AbstractBean.java
   ri/trunk/webbeans-ri/src/main/java/org/jboss/webbeans/bean/EnterpriseBean.java
Log:
minor fixes

Modified: ri/trunk/webbeans-ri/src/main/java/org/jboss/webbeans/bean/AbstractBean.java
===================================================================
--- ri/trunk/webbeans-ri/src/main/java/org/jboss/webbeans/bean/AbstractBean.java	2009-02-21 23:14:10 UTC (rev 1624)
+++ ri/trunk/webbeans-ri/src/main/java/org/jboss/webbeans/bean/AbstractBean.java	2009-02-21 23:16:05 UTC (rev 1625)
@@ -523,7 +523,7 @@
 
    public boolean isDependent()
    {
-      return Dependent.class.equals(scopeType);
+      return Dependent.class.equals(getScopeType());
    }
 
    public boolean isSpecializing()

Modified: ri/trunk/webbeans-ri/src/main/java/org/jboss/webbeans/bean/EnterpriseBean.java
===================================================================
--- ri/trunk/webbeans-ri/src/main/java/org/jboss/webbeans/bean/EnterpriseBean.java	2009-02-21 23:14:10 UTC (rev 1624)
+++ ri/trunk/webbeans-ri/src/main/java/org/jboss/webbeans/bean/EnterpriseBean.java	2009-02-21 23:16:05 UTC (rev 1625)
@@ -121,8 +121,7 @@
       super.init();
       initProxyClass();
       initInjectionPoints();
-      checkEnterpriseBeanTypeAllowed();
-      checkEnterpriseScopeAllowed();
+      checkEJBTypeAllowed();
       checkConflictingRoles();
       checkObserverMethods();
    }
@@ -168,13 +167,15 @@
     * Check that the scope type is allowed by the stereotypes on the bean and
     * the bean type
     */
-   protected void checkEnterpriseScopeAllowed()
+   @Override
+   protected void checkScopeAllowed()
    {
+      super.checkScopeAllowed();
       if (ejbDescriptor.isStateless() && !isDependent())
       {
          throw new DefinitionException("Scope " + getScopeType() + " is not allowed on stateless enterpise beans for " + getType() + ". Only @Dependent is allowed on stateless enterprise beans");
       }
-      if (ejbDescriptor.isSingleton() && (!isDependent() || getScopeType().equals(ApplicationScoped.class)))
+      if (ejbDescriptor.isSingleton() && !(isDependent() || getScopeType().equals(ApplicationScoped.class)))
       {
          throw new DefinitionException("Scope " + getScopeType() + " is not allowed on singleton enterpise beans for " + getType() + ". Only @Dependent or @ApplicationScoped is allowed on singleton enterprise beans");
       }
@@ -250,7 +251,7 @@
    /**
     * Validates the bean type
     */
-   private void checkEnterpriseBeanTypeAllowed()
+   private void checkEJBTypeAllowed()
    {
       if (ejbDescriptor.isMessageDriven())
       {