[picketlink-commits] Picketlink SVN: r776 - federation/trunk/picketlink-fed-model/src/main/java/org/picketlink/identity/federation/newmodel/saml/v2/metadata.

[picketlink-commits at lists.jboss.org]

Author: anil.saldhana at jboss.com
Date: 2011-02-23 16:23:57 -0500 (Wed, 23 Feb 2011)
New Revision: 776

Modified:
   federation/trunk/picketlink-fed-model/src/main/java/org/picketlink/identity/federation/newmodel/saml/v2/metadata/EntityDescriptorType.java
Log:
correct the ctr chain

Modified: federation/trunk/picketlink-fed-model/src/main/java/org/picketlink/identity/federation/newmodel/saml/v2/metadata/EntityDescriptorType.java
===================================================================
--- federation/trunk/picketlink-fed-model/src/main/java/org/picketlink/identity/federation/newmodel/saml/v2/metadata/EntityDescriptorType.java	2011-02-23 21:00:29 UTC (rev 775)
+++ federation/trunk/picketlink-fed-model/src/main/java/org/picketlink/identity/federation/newmodel/saml/v2/metadata/EntityDescriptorType.java	2011-02-23 21:23:57 UTC (rev 776)
@@ -89,30 +89,37 @@
       private AttributeAuthorityDescriptorType attribDescriptor;
       private PDPDescriptorType pdpDescriptor;
       
-      public EDTDescriptorChoiceType(RoleDescriptorType roleDescriptor)
-      { 
-         if( roleDescriptor instanceof IDPSSODescriptorType )
+      public EDTDescriptorChoiceType(AuthnAuthorityDescriptorType authnDescriptor)
+      {
+         this.authnDescriptor = authnDescriptor;
+      }
+      
+      public EDTDescriptorChoiceType(AttributeAuthorityDescriptorType attribDescriptor)
+      {
+         this.attribDescriptor = attribDescriptor;
+      }
+      
+      public EDTDescriptorChoiceType(PDPDescriptorType pdpDescriptor)
+      {
+         this.pdpDescriptor = pdpDescriptor;
+      }
+      
+      public EDTDescriptorChoiceType( SSODescriptorType sso )
+      {
+         if(sso instanceof IDPSSODescriptorType )
          {
-            this.idpDescriptor = (IDPSSODescriptorType) roleDescriptor;
+            this.idpDescriptor = (IDPSSODescriptorType) sso;
          }
-         else if( roleDescriptor instanceof SPSSODescriptorType )
-         {
-            this.spDescriptor = (SPSSODescriptorType) roleDescriptor;
-         }
-         else if( roleDescriptor instanceof AuthnAuthorityDescriptorType )
-         {
-            this.authnDescriptor = (AuthnAuthorityDescriptorType) roleDescriptor;
-         }
-         else if( roleDescriptor instanceof AttributeAuthorityDescriptorType )
-         {
-            this.attribDescriptor = (AttributeAuthorityDescriptorType) roleDescriptor;
-         }
-         else if( roleDescriptor instanceof PDPDescriptorType )
-         {
-            this.pdpDescriptor = (PDPDescriptorType) roleDescriptor;
-         }
-         else this.roleDescriptor = roleDescriptor;
+         else
+            this.spDescriptor = (SPSSODescriptorType) sso;
       }
+      
+      public EDTDescriptorChoiceType(RoleDescriptorType roleDescriptor)
+      {  
+          this.roleDescriptor = roleDescriptor;
+      }
+      
+      
       public RoleDescriptorType getRoleDescriptor()
       {
          return roleDescriptor;