You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@maven.apache.org by ca...@apache.org on 2006/09/07 19:37:47 UTC
svn commit: r441150 - in
/maven/shared/trunk/maven-user/maven-user-model/src/main/java/org/apache/maven/user/model:
InstancePermissions.java UserManager.java impl/DefaultUserManager.java
Author: carlos
Date: Thu Sep 7 10:37:46 2006
New Revision: 441150
URL: http://svn.apache.org/viewvc?view=rev&rev=441150
Log:
Change return type of getUsersInstancePermissions
Modified:
maven/shared/trunk/maven-user/maven-user-model/src/main/java/org/apache/maven/user/model/InstancePermissions.java
maven/shared/trunk/maven-user/maven-user-model/src/main/java/org/apache/maven/user/model/UserManager.java
maven/shared/trunk/maven-user/maven-user-model/src/main/java/org/apache/maven/user/model/impl/DefaultUserManager.java
Modified: maven/shared/trunk/maven-user/maven-user-model/src/main/java/org/apache/maven/user/model/InstancePermissions.java
URL: http://svn.apache.org/viewvc/maven/shared/trunk/maven-user/maven-user-model/src/main/java/org/apache/maven/user/model/InstancePermissions.java?view=diff&rev=441150&r1=441149&r2=441150
==============================================================================
--- maven/shared/trunk/maven-user/maven-user-model/src/main/java/org/apache/maven/user/model/InstancePermissions.java (original)
+++ maven/shared/trunk/maven-user/maven-user-model/src/main/java/org/apache/maven/user/model/InstancePermissions.java Thu Sep 7 10:37:46 2006
@@ -16,7 +16,6 @@
* limitations under the License.
*/
-
/**
* User instance permissions
*
@@ -24,7 +23,8 @@
*/
public class InstancePermissions
{
-
+ private User user;
+
private boolean view;
private boolean edit;
@@ -33,8 +33,9 @@
private boolean build;
- public InstancePermissions()
- {
+ public InstancePermissions( User user )
+ {
+ this.user = user;
this.view = false;
this.edit = false;
this.delete = false;
@@ -79,5 +80,15 @@
public void setView( boolean view )
{
this.view = view;
+ }
+
+ public User getUser()
+ {
+ return user;
+ }
+
+ public void setUser( User user )
+ {
+ this.user = user;
}
}
Modified: maven/shared/trunk/maven-user/maven-user-model/src/main/java/org/apache/maven/user/model/UserManager.java
URL: http://svn.apache.org/viewvc/maven/shared/trunk/maven-user/maven-user-model/src/main/java/org/apache/maven/user/model/UserManager.java?view=diff&rev=441150&r1=441149&r2=441150
==============================================================================
--- maven/shared/trunk/maven-user/maven-user-model/src/main/java/org/apache/maven/user/model/UserManager.java (original)
+++ maven/shared/trunk/maven-user/maven-user-model/src/main/java/org/apache/maven/user/model/UserManager.java Thu Sep 7 10:37:46 2006
@@ -17,7 +17,6 @@
*/
import java.util.List;
-import java.util.Map;
/**
* Facade for user related operations.
@@ -221,8 +220,8 @@
/**
* Get the instance permissions for each user
*
- * @return map of instance permissions for each user
+ * @return list of instance permissions for each user
*/
- Map getUsersInstancePermissions();
+ List getUsersInstancePermissions();
}
Modified: maven/shared/trunk/maven-user/maven-user-model/src/main/java/org/apache/maven/user/model/impl/DefaultUserManager.java
URL: http://svn.apache.org/viewvc/maven/shared/trunk/maven-user/maven-user-model/src/main/java/org/apache/maven/user/model/impl/DefaultUserManager.java?view=diff&rev=441150&r1=441149&r2=441150
==============================================================================
--- maven/shared/trunk/maven-user/maven-user-model/src/main/java/org/apache/maven/user/model/impl/DefaultUserManager.java (original)
+++ maven/shared/trunk/maven-user/maven-user-model/src/main/java/org/apache/maven/user/model/impl/DefaultUserManager.java Thu Sep 7 10:37:46 2006
@@ -20,8 +20,6 @@
import java.util.Date;
import java.util.Iterator;
import java.util.List;
-import java.util.Map;
-import java.util.HashMap;
import org.apache.maven.user.model.Messages;
import org.apache.maven.user.model.PasswordRule;
@@ -319,23 +317,23 @@
/**
* Get the instance permissions for each user
*
- * @return map of instance permissions for each user
+ * @return list of instance permissions for each user
*/
- public Map getUsersInstancePermissions()
+ public List getUsersInstancePermissions()
{
List users = getUsers();
- Map usersInstancePermissions = new HashMap();
+ List usersInstancePermissions = new ArrayList();
Iterator i = users.iterator();
while ( i.hasNext() )
{
User user = (User) i.next();
- if ( user != null )
- {
- usersInstancePermissions.put( user, new InstancePermissions() );
- }
+ InstancePermissions userPermissions = new InstancePermissions ( user );
+
+ usersInstancePermissions.add( userPermissions );
+
}
return usersInstancePermissions;
}