dlestrat 2004/09/18 12:36:20
Modified: portal/src/java/org/apache/jetspeed/userinfo/impl
UserInfoManagerImpl.java
Log:
http://nagoya.apache.org/jira/browse/JS2-114#action_53185
Revision Changes Path
1.7 +15 -29
jakarta-jetspeed-2/portal/src/java/org/apache/jetspeed/userinfo/impl/UserInfoManagerImpl.java
Index: UserInfoManagerImpl.java
===================================================================
RCS file:
/home/cvs/jakarta-jetspeed-2/portal/src/java/org/apache/jetspeed/userinfo/impl/UserInfoManagerImpl.java,v
retrieving revision 1.6
retrieving revision 1.7
diff -u -r1.6 -r1.7
--- UserInfoManagerImpl.java 11 Aug 2004 23:56:28 -0000 1.6
+++ UserInfoManagerImpl.java 18 Sep 2004 19:36:19 -0000 1.7
@@ -61,19 +61,15 @@
/** Map used to cache user info maps for each mapped portlet application. */
private static Map userInfoMapCache;
- /**
- * <p>
- * The default user attributes property set.
- * </p>
- */
- static String USER_INFO_PROPERTY_SET = "userinfo";
-
/** The user information property set. */
String userInfoPropertySet;
+
/** The user manager */
UserManager userMgr;
+
/** The portlet registry. */
PortletRegistryComponent registry;
+
/** The object id of the portlet application being processed. */
String oid;
@@ -82,16 +78,14 @@
* Constructor providing access to the [EMAIL PROTECTED] UserManager}.
* </p>
*
- * @param userMgr
- * The user manager.
- * @param registry
- * The portlet registry component.
+ * @param userMgr The user manager.
+ * @param registry The portlet registry component.
*/
public UserInfoManagerImpl(UserManager userMgr, PortletRegistryComponent
registry)
{
this.userMgr = userMgr;
this.registry = registry;
- this.userInfoPropertySet = USER_INFO_PROPERTY_SET;
+ this.userInfoPropertySet = User.USER_INFO_PROPERTY_SET;
initUserInfoMapCache();
}
@@ -101,12 +95,9 @@
* which property set to use for user information.
* </p>
*
- * @param userMgr
- * The user manager.
- * @param registry
- * The portlet registry component.
- * @param userInfoPropertySet
- * The user information property set.
+ * @param userMgr The user manager.
+ * @param registry The portlet registry component.
+ * @param userInfoPropertySet The user information property set.
*
*/
public UserInfoManagerImpl(UserManager userMgr, PortletRegistryComponent
registry, String userInfoPropertySet)
@@ -159,13 +150,10 @@
* user info attribute declared in the portlet.xml descriptor.
* </p>
*
- * @param userInfoPrefs
- * The user info preferences.
- * @param userAttributes
- * The declarative portlet user attributes.
- * @param userAttributeRefs
- * The declarative jetspeed portlet extension user attributes
- * reference.
+ * @param userInfoPrefs The user info preferences.
+ * @param userAttributes The declarative portlet user attributes.
+ * @param userAttributeRefs The declarative jetspeed portlet extension user
+ * attributes reference.
* @return The user info map.
*/
private Map mapUserInfo(Preferences userInfoPrefs, Collection userAttributes,
Collection userAttributeRefs)
@@ -224,7 +212,6 @@
return userInfoMap;
}
-
/**
* <p>
* Gets the user preferences from the user's request.
@@ -233,8 +220,7 @@
* If no user is logged in, return null.
* </p>
*
- * @param context
- * The request context.
+ * @param context The request context.
* @return The user preferences.
*/
private Preferences getUserPreferences(RequestContext context)
---------------------------------------------------------------------
To unsubscribe, e-mail: [EMAIL PROTECTED]
For additional commands, e-mail: [EMAIL PROTECTED]
