Method name change from bugzilla #313.
authorwassa <wassa@ab3bd59b-922f-494d-bb5f-6f0a3c29deca>
Thu, 28 Apr 2005 21:25:07 +0000 (21:25 +0000)
committerwassa <wassa@ab3bd59b-922f-494d-bb5f-6f0a3c29deca>
Thu, 28 Apr 2005 21:25:07 +0000 (21:25 +0000)
git-svn-id: https://subversion.switch.ch/svn/shibboleth/java-idp/trunk@1419 ab3bd59b-922f-494d-bb5f-6f0a3c29deca

src/edu/internet2/middleware/shibboleth/common/NameIdentifierMapping.java
src/edu/internet2/middleware/shibboleth/common/NameMapper.java
src/edu/internet2/middleware/shibboleth/common/provider/CryptoShibHandle.java
src/edu/internet2/middleware/shibboleth/common/provider/PrincipalNameIdentifier.java
src/edu/internet2/middleware/shibboleth/common/provider/SharedMemoryShibHandle.java
src/edu/internet2/middleware/shibboleth/common/provider/X509SubjectNameNameIdentifierMapping.java

index 1b71aec..3c1a8aa 100644 (file)
@@ -85,7 +85,7 @@ public interface NameIdentifierMapping {
         * @throws NameIdentifierMappingException
         *             If the {@link NameMapper}encounters an internal error
         */
-       public SAMLNameIdentifier getNameIdentifierName(AuthNPrincipal principal, ServiceProvider sProv,
+       public SAMLNameIdentifier getNameIdentifier(AuthNPrincipal principal, ServiceProvider sProv,
                        IdentityProvider idProv) throws NameIdentifierMappingException;
 
        /**
index 3ad51a3..3309bea 100644 (file)
@@ -289,7 +289,7 @@ public class NameMapper {
                NameIdentifierMapping mapping = getNameIdentifierMappingById(id);
 
                if (mapping == null) { throw new NameIdentifierMappingException("Name Identifier id not registered."); }
-               return mapping.getNameIdentifierName(principal, sProv, idProv);
+               return mapping.getNameIdentifier(principal, sProv, idProv);
        }
 
        /**
@@ -366,7 +366,7 @@ public class NameMapper {
                 *      edu.internet2.middleware.shibboleth.common.ServiceProvider,
                 *      edu.internet2.middleware.shibboleth.common.IdentityProvider)
                 */
-               public SAMLNameIdentifier getNameIdentifierName(AuthNPrincipal principal, ServiceProvider sProv,
+               public SAMLNameIdentifier getNameIdentifier(AuthNPrincipal principal, ServiceProvider sProv,
                                IdentityProvider idProv) throws NameIdentifierMappingException {
 
                        try {
index 9f3609f..468b716 100644 (file)
@@ -250,7 +250,7 @@ public class CryptoShibHandle extends AQHNameIdentifierMapping implements NameId
         * to encode the IV or MAC's lengths. They can be obtained from Cipher.getBlockSize() and Mac.getMacLength(),
         * respectively.
         */
-       public SAMLNameIdentifier getNameIdentifierName(AuthNPrincipal principal, ServiceProvider sProv,
+       public SAMLNameIdentifier getNameIdentifier(AuthNPrincipal principal, ServiceProvider sProv,
                        IdentityProvider idProv) throws NameIdentifierMappingException {
 
                try {
index da7ba72..b24f697 100644 (file)
@@ -59,7 +59,7 @@ public class PrincipalNameIdentifier extends BaseNameIdentifierMapping {
                return new AuthNPrincipal(nameId.getName());
        }
 
-       public SAMLNameIdentifier getNameIdentifierName(AuthNPrincipal principal, ServiceProvider sProv,
+       public SAMLNameIdentifier getNameIdentifier(AuthNPrincipal principal, ServiceProvider sProv,
                        IdentityProvider idProv) throws NameIdentifierMappingException {
 
                if (principal == null) {
index 1b2760d..84c7bb7 100644 (file)
@@ -62,7 +62,7 @@ public class SharedMemoryShibHandle extends AQHNameIdentifierMapping implements
                super(config);
        }
 
-       public SAMLNameIdentifier getNameIdentifierName(AuthNPrincipal principal, ServiceProvider sProv,
+       public SAMLNameIdentifier getNameIdentifier(AuthNPrincipal principal, ServiceProvider sProv,
                        IdentityProvider idProv) throws NameIdentifierMappingException {
 
                if (principal == null) {
index bacef7a..9b2ae8f 100644 (file)
@@ -96,7 +96,7 @@ public class X509SubjectNameNameIdentifierMapping extends BaseNameIdentifierMapp
         *      edu.internet2.middleware.shibboleth.common.ServiceProvider,
         *      edu.internet2.middleware.shibboleth.common.IdentityProvider)
         */
-       public SAMLNameIdentifier getNameIdentifierName(AuthNPrincipal principal, ServiceProvider sProv,
+       public SAMLNameIdentifier getNameIdentifier(AuthNPrincipal principal, ServiceProvider sProv,
                        IdentityProvider idProv) throws NameIdentifierMappingException {
 
                try {