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/15 23:09:58 UTC
svn commit: r446735 - in /maven/shared/trunk/maven-user:
maven-user-controller/src/main/java/org/apache/maven/user/controller/action/DeleteUserAction.java
maven-user-webapp/src/main/webapp/user/delete.jsp
Author: carlos
Date: Fri Sep 15 14:09:56 2006
New Revision: 446735
URL: http://svn.apache.org/viewvc?view=rev&rev=446735
Log:
Rename accountId to id
Modified:
maven/shared/trunk/maven-user/maven-user-controller/src/main/java/org/apache/maven/user/controller/action/DeleteUserAction.java
maven/shared/trunk/maven-user/maven-user-webapp/src/main/webapp/user/delete.jsp
Modified: maven/shared/trunk/maven-user/maven-user-controller/src/main/java/org/apache/maven/user/controller/action/DeleteUserAction.java
URL: http://svn.apache.org/viewvc/maven/shared/trunk/maven-user/maven-user-controller/src/main/java/org/apache/maven/user/controller/action/DeleteUserAction.java?view=diff&rev=446735&r1=446734&r2=446735
==============================================================================
--- maven/shared/trunk/maven-user/maven-user-controller/src/main/java/org/apache/maven/user/controller/action/DeleteUserAction.java (original)
+++ maven/shared/trunk/maven-user/maven-user-controller/src/main/java/org/apache/maven/user/controller/action/DeleteUserAction.java Fri Sep 15 14:09:56 2006
@@ -16,6 +16,7 @@
* limitations under the License.
*/
+import org.apache.maven.user.model.User;
import org.apache.maven.user.model.UserManager;
import org.codehaus.plexus.xwork.action.PlexusActionSupport;
@@ -35,40 +36,38 @@
*/
private UserManager userManager;
- private int accountId;
-
+ private int id;
+
private String username;
public String execute()
throws Exception
{
- userManager.removeUser( accountId );
+ userManager.removeUser( id );
return SUCCESS;
}
public String doDelete()
{
+ User user = userManager.getUser( id );
+ username = user.getUsername();
+
return "delete";
}
- public int getAccountId()
+ public int getId()
{
- return accountId;
+ return id;
}
- public void setAccountId( int accountId )
+ public void setId( int id )
{
- this.accountId = accountId;
+ this.id = id;
}
public String getUsername()
{
return username;
}
- public void setUsername( String username )
- {
- this.username = username;
- }
-
}
Modified: maven/shared/trunk/maven-user/maven-user-webapp/src/main/webapp/user/delete.jsp
URL: http://svn.apache.org/viewvc/maven/shared/trunk/maven-user/maven-user-webapp/src/main/webapp/user/delete.jsp?view=diff&rev=446735&r1=446734&r2=446735
==============================================================================
--- maven/shared/trunk/maven-user/maven-user-webapp/src/main/webapp/user/delete.jsp (original)
+++ maven/shared/trunk/maven-user/maven-user-webapp/src/main/webapp/user/delete.jsp Fri Sep 15 14:09:56 2006
@@ -18,7 +18,7 @@
</div>
<div class="functnbar3">
<ww:form action="delete.action" method="post">
- <ww:hidden name="accountId"/>
+ <ww:hidden name="id"/>
<ww:submit value="%{getText('delete')}"/> <!-- todo: change to submit/cancel button -->
</ww:form>
</div>