You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@openwebbeans.apache.org by ge...@apache.org on 2008/12/27 23:33:11 UTC
svn commit: r729690 - in
/incubator/openwebbeans/trunk/webbeans-impl/src/main/java/org/apache/webbeans/deployment:
StereoTypeModel.java XMLStereoTypeModel.java
Author: gerdogdu
Date: Sat Dec 27 14:33:11 2008
New Revision: 729690
URL: http://svn.apache.org/viewvc?rev=729690&view=rev
Log:
Adding ElementType.FIELD check for inherited stereotype check.
Modified:
incubator/openwebbeans/trunk/webbeans-impl/src/main/java/org/apache/webbeans/deployment/StereoTypeModel.java
incubator/openwebbeans/trunk/webbeans-impl/src/main/java/org/apache/webbeans/deployment/XMLStereoTypeModel.java
Modified: incubator/openwebbeans/trunk/webbeans-impl/src/main/java/org/apache/webbeans/deployment/StereoTypeModel.java
URL: http://svn.apache.org/viewvc/incubator/openwebbeans/trunk/webbeans-impl/src/main/java/org/apache/webbeans/deployment/StereoTypeModel.java?rev=729690&r1=729689&r2=729690&view=diff
==============================================================================
--- incubator/openwebbeans/trunk/webbeans-impl/src/main/java/org/apache/webbeans/deployment/StereoTypeModel.java (original)
+++ incubator/openwebbeans/trunk/webbeans-impl/src/main/java/org/apache/webbeans/deployment/StereoTypeModel.java Sat Dec 27 14:33:11 2008
@@ -89,7 +89,7 @@
for(ElementType innerValue : innerValues)
{
- if(innerValue.equals(ElementType.METHOD))
+ if(innerValue.equals(ElementType.METHOD) || innerValue.equals(ElementType.FIELD))
{
for(ElementType outerValue : outerValues)
{
@@ -104,7 +104,7 @@
{
for(ElementType outerValue : outerValues)
{
- if(outerValue.equals(ElementType.METHOD))
+ if(outerValue.equals(ElementType.METHOD) || outerValue.equals(ElementType.FIELD))
{
throw new WebBeansConfigurationException("Inherited StereoType with class name : " + clazz.getName() +
" must have compatible @Target annotation with Stereotype class name : " + clazz.getName());
Modified: incubator/openwebbeans/trunk/webbeans-impl/src/main/java/org/apache/webbeans/deployment/XMLStereoTypeModel.java
URL: http://svn.apache.org/viewvc/incubator/openwebbeans/trunk/webbeans-impl/src/main/java/org/apache/webbeans/deployment/XMLStereoTypeModel.java?rev=729690&r1=729689&r2=729690&view=diff
==============================================================================
--- incubator/openwebbeans/trunk/webbeans-impl/src/main/java/org/apache/webbeans/deployment/XMLStereoTypeModel.java (original)
+++ incubator/openwebbeans/trunk/webbeans-impl/src/main/java/org/apache/webbeans/deployment/XMLStereoTypeModel.java Sat Dec 27 14:33:11 2008
@@ -144,7 +144,7 @@
for(ElementType innerValue : innerValues)
{
- if(innerValue.equals(ElementType.METHOD))
+ if(innerValue.equals(ElementType.METHOD) || innerValue.equals(ElementType.FIELD))
{
for(ElementType outerValue : outerValues)
{
@@ -159,7 +159,7 @@
{
for(ElementType outerValue : outerValues)
{
- if(outerValue.equals(ElementType.METHOD))
+ if(outerValue.equals(ElementType.METHOD) || outerValue.equals(ElementType.FIELD))
{
throw new WebBeansConfigurationException(errorMessage + "Inherited StereoType with class name : " + clazz.getName() +
" must have compatible @Target annotation with Stereotype class name : " + outerStereoClass.getName());