svn commit: r1363080 - in /openwebbeans/trunk/webbeans-impl/src/main/java/org/apache/webbeans/component: AbstractOwbBean.java OwbBean.java

[st...@apache.org]

Author: struberg
Date: Wed Jul 18 20:00:44 2012
New Revision: 1363080

URL: http://svn.apache.org/viewvc?rev=1363080&view=rev
Log:
OWB-683 remove getImplScopeType

Modified:
    openwebbeans/trunk/webbeans-impl/src/main/java/org/apache/webbeans/component/AbstractOwbBean.java
    openwebbeans/trunk/webbeans-impl/src/main/java/org/apache/webbeans/component/OwbBean.java

Modified: openwebbeans/trunk/webbeans-impl/src/main/java/org/apache/webbeans/component/AbstractOwbBean.java
URL: http://svn.apache.org/viewvc/openwebbeans/trunk/webbeans-impl/src/main/java/org/apache/webbeans/component/AbstractOwbBean.java?rev=1363080&r1=1363079&r2=1363080&view=diff
==============================================================================
--- openwebbeans/trunk/webbeans-impl/src/main/java/org/apache/webbeans/component/AbstractOwbBean.java (original)
+++ openwebbeans/trunk/webbeans-impl/src/main/java/org/apache/webbeans/component/AbstractOwbBean.java Wed Jul 18 20:00:44 2012
@@ -57,9 +57,6 @@ public abstract class AbstractOwbBean<T>
     /** Name of the bean */
     protected String name;
 
-    /** Scope type of the bean */
-    protected Annotation implScopeType;
-
     /** Cached scope type of the bean */
     protected Class<? extends Annotation> scopeClass;
 
@@ -346,24 +343,13 @@ public abstract class AbstractOwbBean<T>
     }
 
     /**
-     * Get scope type.
-     * 
-     * @return scope type
-     */
-    public Annotation getImplScopeType()
-    {
-        return implScopeType;
-    }
-
-    /**
      * Set scope type.
      * 
      * @param scopeType scope type
      */
     public void setImplScopeType(Annotation scopeType)
     {
-        implScopeType = scopeType;
-        scopeClass = implScopeType.annotationType();
+        scopeClass = scopeType.annotationType();
         cachedHashCode = 0;
     }
 
@@ -740,7 +726,6 @@ public abstract class AbstractOwbBean<T>
         result = prime * result + (enabled ? 1231 : 1237);
         result = prime * result + (isAlternative() ? 1289 : 1273);
         result = prime * result + ((implQualifiers == null) ? 0 : implQualifiers.hashCode());
-        result = prime * result + ((implScopeType == null) ? 0 : implScopeType.hashCode());
         result = prime * result + ((injectionPoints == null) ? 0 : injectionPoints.hashCode());
         result = prime * result + ((name == null) ? 0 : name.hashCode());
         result = prime * result + (nullable ? 1231 : 1237);
@@ -801,17 +786,6 @@ public abstract class AbstractOwbBean<T>
         {
             return false;
         }
-        if (implScopeType == null)
-        {
-            if (other.implScopeType != null)
-            {
-                return false;
-            }
-        }
-        else if (!implScopeType.equals(other.implScopeType))
-        {
-            return false;
-        }
         if (injectionPoints == null)
         {
             if (other.injectionPoints != null)

Modified: openwebbeans/trunk/webbeans-impl/src/main/java/org/apache/webbeans/component/OwbBean.java
URL: http://svn.apache.org/viewvc/openwebbeans/trunk/webbeans-impl/src/main/java/org/apache/webbeans/component/OwbBean.java?rev=1363080&r1=1363079&r2=1363080&view=diff
==============================================================================
--- openwebbeans/trunk/webbeans-impl/src/main/java/org/apache/webbeans/component/OwbBean.java (original)
+++ openwebbeans/trunk/webbeans-impl/src/main/java/org/apache/webbeans/component/OwbBean.java Wed Jul 18 20:00:44 2012
@@ -36,14 +36,7 @@ import org.apache.webbeans.config.WebBea
  * <T> bean class
  */
 public interface OwbBean<T> extends Bean<T>
-{        
-    /**
-     * Returns scope type annotation.
-     * 
-     * @return scope type annotation
-     */
-    public Annotation getImplScopeType();
-
+{
     /**
      * Sets bean scope type annotation.
      * 
@@ -208,4 +201,4 @@ public interface OwbBean<T> extends Bean
     public void validatePassivationDependencies();
 
     public WebBeansContext getWebBeansContext();
-}
\ No newline at end of file
+}