Author: dlestrat
Date: Sun Jul 31 08:37:43 2005
New Revision: 226649
URL: http://svn.apache.org/viewcvs?rev=226649&view=rev
Log:
Formatting.
Modified:
portals/jetspeed-2/trunk/components/portal/src/java/org/apache/jetspeed/userinfo/impl/UserManagerUserAttributeSourceImpl.java
Modified:
portals/jetspeed-2/trunk/components/portal/src/java/org/apache/jetspeed/userinfo/impl/UserManagerUserAttributeSourceImpl.java
URL:
http://svn.apache.org/viewcvs/portals/jetspeed-2/trunk/components/portal/src/java/org/apache/jetspeed/userinfo/impl/UserManagerUserAttributeSourceImpl.java?rev=226649&r1=226648&r2=226649&view=diff
==============================================================================
---
portals/jetspeed-2/trunk/components/portal/src/java/org/apache/jetspeed/userinfo/impl/UserManagerUserAttributeSourceImpl.java
(original)
+++
portals/jetspeed-2/trunk/components/portal/src/java/org/apache/jetspeed/userinfo/impl/UserManagerUserAttributeSourceImpl.java
Sun Jul 31 08:37:43 2005
@@ -1,17 +1,17 @@
/* Copyright 2004 Apache Software Foundation
-*
-* Licensed under the Apache License, Version 2.0 (the "License");
-* you may not use this file except in compliance with the License.
-* You may obtain a copy of the License at
-*
-* http://www.apache.org/licenses/LICENSE-2.0
-*
-* Unless required by applicable law or agreed to in writing, software
-* distributed under the License is distributed on an "AS IS" BASIS,
-* WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-* See the License for the specific language governing permissions and
-* limitations under the License.
-*/
+ *
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ *
+ * http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
package org.apache.jetspeed.userinfo.impl;
import java.security.Principal;
@@ -36,8 +36,7 @@
import org.apache.jetspeed.userinfo.UserAttributeSource;
/**
- * Default implementation of a UserAttribute source
- * Provides users attributes from standard prefs implementation
+ * Default implementation of a UserAttribute source Provides users attributes
from standard prefs implementation
*
* @author <a href="mailto:[EMAIL PROTECTED]">Keith Garry Boyce</a>
* @author <a href="mailto:[EMAIL PROTECTED]">David Sean Taylor</a>
@@ -47,8 +46,7 @@
{
/** Logger */
- private static final Log log = LogFactory
- .getLog(UserManagerUserAttributeSourceImpl.class);
+ private static final Log log =
LogFactory.getLog(UserManagerUserAttributeSourceImpl.class);
/** The user manager */
private UserManager userManager;
@@ -65,17 +63,14 @@
/*
* (non-Javadoc)
*
- * @see
org.jetspeed.userinfo.UserAttributeSource#getUserAttributeMap(javax.security.auth.Subject,
- * java.util.Set)
+ * @see
org.jetspeed.userinfo.UserAttributeSource#getUserAttributeMap(javax.security.auth.Subject,
java.util.Set)
*/
- public Map getUserAttributeMap(Subject subject,
- Collection userAttributeRefs, RequestContext context)
+ public Map getUserAttributeMap(Subject subject, Collection
userAttributeRefs, RequestContext context)
throws UserAttributeRetrievalException
{
Map userAttributeMap = new HashMap();
- Principal userPrincipal = SecurityHelper.getPrincipal(subject,
- UserPrincipal.class);
+ Principal userPrincipal = SecurityHelper.getPrincipal(subject,
UserPrincipal.class);
if (null != userPrincipal)
{
log.debug("Got user principal: " + userPrincipal.getName());
@@ -85,27 +80,21 @@
{
User user = userManager.getUser(userPrincipal.getName());
Preferences userInfoPrefs = user.getPreferences();
- for (Iterator iter = userAttributeRefs.iterator();
- iter.hasNext();)
+ for (Iterator iter = userAttributeRefs.iterator();
iter.hasNext();)
{
- UserAttributeRef currentAttributeRef =
- (UserAttributeRef) iter.next();
- Object value = userInfoPrefs.get(currentAttributeRef
- .getName(), null);
+ UserAttributeRef currentAttributeRef =
(UserAttributeRef) iter.next();
+ Object value =
userInfoPrefs.get(currentAttributeRef.getName(), null);
if (value != null)
{
- userAttributeMap.put(currentAttributeRef.getName(),
- value);
+
userAttributeMap.put(currentAttributeRef.getName(), value);
}
}
}
- } catch (SecurityException sex)
+ }
+ catch (SecurityException sex)
{
- log
- .warn(
- "Unexpected SecurityException in
UserInfoManager",
- sex);
+ log.warn("Unexpected SecurityException in UserInfoManager",
sex);
}
}
---------------------------------------------------------------------
To unsubscribe, e-mail: [EMAIL PROTECTED]
For additional commands, e-mail: [EMAIL PROTECTED]
