[jboss-cvs] JBossAS SVN: r66785 - in projects/metadata/trunk/src/main/java/org/jboss/metadata: ejb/spec and 1 other directory.

[jboss-cvs-commits at lists.jboss.org]

Author: alex.loubyansky at jboss.com
Date: 2007-11-06 09:29:02 -0500 (Tue, 06 Nov 2007)
New Revision: 66785

Modified:
   projects/metadata/trunk/src/main/java/org/jboss/metadata/RelationshipRoleMetaData.java
   projects/metadata/trunk/src/main/java/org/jboss/metadata/ejb/spec/RelationRoleMetaData.java
Log:
annotated transient fields, fixed NPE in for CMR info when cmr-field is not provided

Modified: projects/metadata/trunk/src/main/java/org/jboss/metadata/RelationshipRoleMetaData.java
===================================================================
--- projects/metadata/trunk/src/main/java/org/jboss/metadata/RelationshipRoleMetaData.java	2007-11-06 14:26:30 UTC (rev 66784)
+++ projects/metadata/trunk/src/main/java/org/jboss/metadata/RelationshipRoleMetaData.java	2007-11-06 14:29:02 UTC (rev 66785)
@@ -21,6 +21,7 @@
  */
 package org.jboss.metadata;
 
+import org.jboss.metadata.ejb.spec.CMRFieldMetaData;
 import org.jboss.metadata.ejb.spec.RelationRoleMetaData;
 import org.jboss.metadata.spi.MetaData;
 
@@ -135,7 +136,8 @@
     */
    public String getCMRFieldName()
    {
-      return getDelegate().getCmrField().getCmrFieldName();
+      CMRFieldMetaData cmrField = getDelegate().getCmrField();
+      return cmrField == null ? null : cmrField.getCmrFieldName();
    }
 
    /**
@@ -145,6 +147,7 @@
     */
    public String getCMRFieldType()
    {
-      return getDelegate().getCmrField().getCmrFieldType();
+      CMRFieldMetaData cmrField = getDelegate().getCmrField();
+      return cmrField == null ? null : cmrField.getCmrFieldType();
    }
 }

Modified: projects/metadata/trunk/src/main/java/org/jboss/metadata/ejb/spec/RelationRoleMetaData.java
===================================================================
--- projects/metadata/trunk/src/main/java/org/jboss/metadata/ejb/spec/RelationRoleMetaData.java	2007-11-06 14:26:30 UTC (rev 66784)
+++ projects/metadata/trunk/src/main/java/org/jboss/metadata/ejb/spec/RelationRoleMetaData.java	2007-11-06 14:29:02 UTC (rev 66785)
@@ -24,6 +24,7 @@
 import org.jboss.metadata.javaee.spec.EmptyMetaData;
 import org.jboss.metadata.javaee.support.NamedMetaDataWithDescriptions;
 import javax.xml.bind.annotation.XmlElement;
+import javax.xml.bind.annotation.XmlTransient;
 import javax.xml.bind.annotation.XmlType;
 
 /**
@@ -111,6 +112,7 @@
     * 
     * @return true when it is one
     */
+   @XmlTransient
    public boolean isMultiplicityOne()
    {
       return multiplicityType == MultiplicityType.One;
@@ -121,11 +123,13 @@
     * 
     * @return true when it is many
     */
+   @XmlTransient
    public boolean isMultiplicityMany()
    {
       return multiplicityType == MultiplicityType.Many;
    }
    
+   @XmlTransient
    public boolean isCascadedDelete()
    {
       return cascadedDelete != null;
@@ -156,6 +160,7 @@
     * 
     * @return the relation.
     */
+   @XmlTransient
    public RelationMetaData getRelation()
    {
       return relation;
@@ -179,6 +184,7 @@
     * 
     * @return the related role
     */
+   @XmlTransient
    public RelationRoleMetaData getRelatedRole()
    {
       if (relation == null)