[webbeans-commits] Webbeans SVN: r3670 - in ri/trunk: impl/src/main/java/org/jboss/webbeans/util/el and 7 other directories.

Author: pete.muir(a)jboss.org Date: 2009-09-15 11:33:16 -0400 (Tue, 15 Sep 2009) New Revision: 3670 Modified: ri/trunk/impl/src/main/java/org/jboss/webbeans/resolution/ForwardingResolvable.java ri/trunk/impl/src/main/java/org/jboss/webbeans/util/el/ForwardingELContext.java ri/trunk/impl/src/main/java/org/jboss/webbeans/util/el/ForwardingELResolver.java ri/trunk/impl/src/main/java/org/jboss/webbeans/util/el/ForwardingExpressionFactory.java ri/trunk/impl/src/main/java/org/jboss/webbeans/util/el/ForwardingMethodExpression.java ri/trunk/impl/src/main/java/org/jboss/webbeans/util/el/ForwardingValueExpression.java ri/trunk/spi/src/main/java/org/jboss/webbeans/bootstrap/api/helpers/ForwardingBootstrap.java ri/trunk/spi/src/main/java/org/jboss/webbeans/bootstrap/api/helpers/ForwardingLifecycle.java ri/trunk/spi/src/main/java/org/jboss/webbeans/bootstrap/spi/helpers/ForwardingBeanDeploymentArchive.java ri/trunk/spi/src/main/java/org/jboss/webbeans/context/api/helpers/ForwardingBeanStore.java ri/trunk/spi/src/main/java/org/jboss/webbeans/ejb/spi/helpers/ForwardingEjbDescriptor.java ri/trunk/spi/src/main/java/org/jboss/webbeans/ejb/spi/helpers/ForwardingEjbServices.java ri/trunk/spi/src/main/java/org/jboss/webbeans/injection/spi/helpers/ForwardingJpaInjectionServices.java ri/trunk/spi/src/main/java/org/jboss/webbeans/resources/spi/helpers/ForwardingResourceLoader.java ri/trunk/tests/src/main/java/org/jboss/webbeans/mock/MockEjbDescriptor.java Log: Fix equals Modified: ri/trunk/impl/src/main/java/org/jboss/webbeans/resolution/ForwardingResolvable.java =================================================================== --- ri/trunk/impl/src/main/java/org/jboss/webbeans/resolution/ForwardingResolvable.java 2009-09-15 15:25:53 UTC (rev 3669) +++ ri/trunk/impl/src/main/java/org/jboss/webbeans/resolution/ForwardingResolvable.java 2009-09-15 15:33:16 UTC (rev 3670) @@ -65,7 +65,7 @@ @Override public boolean equals(Object obj) { - return delegate().equals(obj); + return this == obj || delegate().equals(obj); } @Override Modified: ri/trunk/impl/src/main/java/org/jboss/webbeans/util/el/ForwardingELContext.java =================================================================== --- ri/trunk/impl/src/main/java/org/jboss/webbeans/util/el/ForwardingELContext.java 2009-09-15 15:25:53 UTC (rev 3669) +++ ri/trunk/impl/src/main/java/org/jboss/webbeans/util/el/ForwardingELContext.java 2009-09-15 15:33:16 UTC (rev 3670) @@ -55,7 +55,7 @@ @Override public boolean equals(Object obj) { - return delgate().equals(obj); + return this == obj || delgate().equals(obj); } @SuppressWarnings("unchecked") Modified: ri/trunk/impl/src/main/java/org/jboss/webbeans/util/el/ForwardingELResolver.java =================================================================== --- ri/trunk/impl/src/main/java/org/jboss/webbeans/util/el/ForwardingELResolver.java 2009-09-15 15:25:53 UTC (rev 3669) +++ ri/trunk/impl/src/main/java/org/jboss/webbeans/util/el/ForwardingELResolver.java 2009-09-15 15:33:16 UTC (rev 3670) @@ -66,7 +66,7 @@ @Override public boolean equals(Object obj) { - return delegate().equals(obj); + return this == obj || delegate().equals(obj); } @Override Modified: ri/trunk/impl/src/main/java/org/jboss/webbeans/util/el/ForwardingExpressionFactory.java =================================================================== --- ri/trunk/impl/src/main/java/org/jboss/webbeans/util/el/ForwardingExpressionFactory.java 2009-09-15 15:25:53 UTC (rev 3669) +++ ri/trunk/impl/src/main/java/org/jboss/webbeans/util/el/ForwardingExpressionFactory.java 2009-09-15 15:33:16 UTC (rev 3670) @@ -58,7 +58,7 @@ @Override public boolean equals(Object obj) { - return delegate().equals(obj); + return this == obj || delegate().equals(obj); } @Override Modified: ri/trunk/impl/src/main/java/org/jboss/webbeans/util/el/ForwardingMethodExpression.java =================================================================== --- ri/trunk/impl/src/main/java/org/jboss/webbeans/util/el/ForwardingMethodExpression.java 2009-09-15 15:25:53 UTC (rev 3669) +++ ri/trunk/impl/src/main/java/org/jboss/webbeans/util/el/ForwardingMethodExpression.java 2009-09-15 15:33:16 UTC (rev 3670) @@ -55,11 +55,10 @@ return delegate().isLiteralText(); } - @Override public boolean equals(Object obj) { - return delegate().equals(obj); + return this == obj || delegate().equals(obj); } @Override Modified: ri/trunk/impl/src/main/java/org/jboss/webbeans/util/el/ForwardingValueExpression.java =================================================================== --- ri/trunk/impl/src/main/java/org/jboss/webbeans/util/el/ForwardingValueExpression.java 2009-09-15 15:25:53 UTC (rev 3669) +++ ri/trunk/impl/src/main/java/org/jboss/webbeans/util/el/ForwardingValueExpression.java 2009-09-15 15:33:16 UTC (rev 3670) @@ -77,7 +77,7 @@ @Override public boolean equals(Object obj) { - return delegate().equals(obj); + return this == obj || delegate().equals(obj); } @Override Modified: ri/trunk/spi/src/main/java/org/jboss/webbeans/bootstrap/api/helpers/ForwardingBootstrap.java =================================================================== --- ri/trunk/spi/src/main/java/org/jboss/webbeans/bootstrap/api/helpers/ForwardingBootstrap.java 2009-09-15 15:25:53 UTC (rev 3669) +++ ri/trunk/spi/src/main/java/org/jboss/webbeans/bootstrap/api/helpers/ForwardingBootstrap.java 2009-09-15 15:33:16 UTC (rev 3670) @@ -63,7 +63,7 @@ @Override public boolean equals(Object obj) { - return delegate().equals(obj); + return this == obj ||delegate().equals(obj); } public Bootstrap deployBeans() Modified: ri/trunk/spi/src/main/java/org/jboss/webbeans/bootstrap/api/helpers/ForwardingLifecycle.java =================================================================== --- ri/trunk/spi/src/main/java/org/jboss/webbeans/bootstrap/api/helpers/ForwardingLifecycle.java 2009-09-15 15:25:53 UTC (rev 3669) +++ ri/trunk/spi/src/main/java/org/jboss/webbeans/bootstrap/api/helpers/ForwardingLifecycle.java 2009-09-15 15:33:16 UTC (rev 3670) @@ -105,7 +105,7 @@ @Override public boolean equals(Object obj) { - return delegate().equals(obj); + return this == obj || delegate().equals(obj); } } Modified: ri/trunk/spi/src/main/java/org/jboss/webbeans/bootstrap/spi/helpers/ForwardingBeanDeploymentArchive.java =================================================================== --- ri/trunk/spi/src/main/java/org/jboss/webbeans/bootstrap/spi/helpers/ForwardingBeanDeploymentArchive.java 2009-09-15 15:25:53 UTC (rev 3669) +++ ri/trunk/spi/src/main/java/org/jboss/webbeans/bootstrap/spi/helpers/ForwardingBeanDeploymentArchive.java 2009-09-15 15:33:16 UTC (rev 3670) @@ -60,7 +60,7 @@ @Override public boolean equals(Object obj) { - return delegate().equals(obj); + return this == obj || delegate().equals(obj); } @Override Modified: ri/trunk/spi/src/main/java/org/jboss/webbeans/context/api/helpers/ForwardingBeanStore.java =================================================================== --- ri/trunk/spi/src/main/java/org/jboss/webbeans/context/api/helpers/ForwardingBeanStore.java 2009-09-15 15:25:53 UTC (rev 3669) +++ ri/trunk/spi/src/main/java/org/jboss/webbeans/context/api/helpers/ForwardingBeanStore.java 2009-09-15 15:33:16 UTC (rev 3670) @@ -47,7 +47,7 @@ @Override public boolean equals(Object obj) { - return delegate().equals(obj); + return this == obj || delegate().equals(obj); } } Modified: ri/trunk/spi/src/main/java/org/jboss/webbeans/ejb/spi/helpers/ForwardingEjbDescriptor.java =================================================================== --- ri/trunk/spi/src/main/java/org/jboss/webbeans/ejb/spi/helpers/ForwardingEjbDescriptor.java 2009-09-15 15:25:53 UTC (rev 3669) +++ ri/trunk/spi/src/main/java/org/jboss/webbeans/ejb/spi/helpers/ForwardingEjbDescriptor.java 2009-09-15 15:33:16 UTC (rev 3670) @@ -65,7 +65,7 @@ @Override public boolean equals(Object obj) { - return delegate().equals(obj); + return this == obj || delegate().equals(obj); } @Override Modified: ri/trunk/spi/src/main/java/org/jboss/webbeans/ejb/spi/helpers/ForwardingEjbServices.java =================================================================== --- ri/trunk/spi/src/main/java/org/jboss/webbeans/ejb/spi/helpers/ForwardingEjbServices.java 2009-09-15 15:25:53 UTC (rev 3669) +++ ri/trunk/spi/src/main/java/org/jboss/webbeans/ejb/spi/helpers/ForwardingEjbServices.java 2009-09-15 15:33:16 UTC (rev 3670) @@ -43,7 +43,7 @@ @Override public boolean equals(Object obj) { - return delegate().equals(obj); + return this == obj || delegate().equals(obj); } @Override Modified: ri/trunk/spi/src/main/java/org/jboss/webbeans/injection/spi/helpers/ForwardingJpaInjectionServices.java =================================================================== --- ri/trunk/spi/src/main/java/org/jboss/webbeans/injection/spi/helpers/ForwardingJpaInjectionServices.java 2009-09-15 15:25:53 UTC (rev 3669) +++ ri/trunk/spi/src/main/java/org/jboss/webbeans/injection/spi/helpers/ForwardingJpaInjectionServices.java 2009-09-15 15:33:16 UTC (rev 3670) @@ -62,7 +62,7 @@ @Override public boolean equals(Object obj) { - return delegate().equals(obj); + return this == obj || delegate().equals(obj); } } Modified: ri/trunk/spi/src/main/java/org/jboss/webbeans/resources/spi/helpers/ForwardingResourceLoader.java =================================================================== --- ri/trunk/spi/src/main/java/org/jboss/webbeans/resources/spi/helpers/ForwardingResourceLoader.java 2009-09-15 15:25:53 UTC (rev 3669) +++ ri/trunk/spi/src/main/java/org/jboss/webbeans/resources/spi/helpers/ForwardingResourceLoader.java 2009-09-15 15:33:16 UTC (rev 3670) @@ -38,7 +38,7 @@ @Override public boolean equals(Object obj) { - return delegate().equals(obj); + return this == obj || delegate().equals(obj); } @Override Modified: ri/trunk/tests/src/main/java/org/jboss/webbeans/mock/MockEjbDescriptor.java =================================================================== --- ri/trunk/tests/src/main/java/org/jboss/webbeans/mock/MockEjbDescriptor.java 2009-09-15 15:25:53 UTC (rev 3669) +++ ri/trunk/tests/src/main/java/org/jboss/webbeans/mock/MockEjbDescriptor.java 2009-09-15 15:33:16 UTC (rev 3670) @@ -178,24 +178,24 @@ return builder.toString(); } - @Override - public boolean equals(Object other) - { - if (other instanceof EjbDescriptor) - { - EjbDescriptor<T> that = (EjbDescriptor<T>) other; - return this.getBeanClass().equals(that.getBeanClass()); - } - else - { - return false; - } - } - - @Override - public int hashCode() - { - return getEjbName().hashCode(); - } +// @Override +// public boolean equals(Object other) +// { +// if (other instanceof EjbDescriptor) +// { +// EjbDescriptor<T> that = (EjbDescriptor<T>) other; +// return this.getBeanClass().equals(that.getBeanClass()); +// } +// else +// { +// return false; +// } +// } +// +// @Override +// public int hashCode() +// { +// return getEjbName().hashCode(); +// } }