Subversion Repositories WebE

Compare Revisions

Last modification

Regard whitespace Rev 22 → Rev 21

/trunk/src/ch/ffhs/webE/action/UserAction.java
3,11 → 3,6
import java.util.ArrayList;
import java.util.List;
 
import javax.servlet.http.HttpServletRequest;
 
import org.apache.struts2.ServletActionContext;
 
import com.opensymphony.xwork2.ActionContext;
import com.opensymphony.xwork2.ActionSupport;
import com.opensymphony.xwork2.ModelDriven;
import ch.ffhs.webE.dao.UserDAO;
28,12 → 23,18
return user;
}
 
public String add() {
public String add()
{
userDAO.saveUser(user);
return SUCCESS;
}
 
public String list() {
public String addForm() {
return SUCCESS;
}
public String list()
{
userList = userDAO.listUser();
return SUCCESS;
}
54,11 → 55,4
this.userList = userList;
}
 
public String delete() {
HttpServletRequest request = (HttpServletRequest) ActionContext
.getContext().get(ServletActionContext.HTTP_REQUEST);
userDAO.deleteUser(Integer.parseInt(request.getParameter("id")));
return SUCCESS;
}
 
}
/trunk/src/ch/ffhs/webE/dao/UserDAO.java
9,5 → 9,4
List<User> listUser();
void saveUser(User user);
User searchUsername(String username);
void deleteUser(int userId);
}
/trunk/src/ch/ffhs/webE/dao/UserDAOImpl.java
19,13 → 19,13
@SuppressWarnings("unchecked")
@Override
public List<User> listUser() {
List<User> user = null;
List<User> courses = null;
try {
user = session.createQuery("from User").list();
courses = session.createQuery("from User").list();
} catch (Exception e) {
e.printStackTrace();
}
return user;
return courses;
}
 
@Override
39,34 → 39,19
}
 
/**
* Used to delete a user.
*/
@Override
public void deleteUser(int userId) {
try {
User user = (User) session.get(User.class, userId);
session.delete(user);
} catch (Exception e) {
transaction.rollback();
e.printStackTrace();
}
}
 
/**
* Returns a single user with this user name (used for login)
*
* @param username
* : String - entire user name
* @return User: Returns a user object if something is found. If not, null
* is returned
* @param username: String - entire user name
* @return User: Returns a user object if something is found. If not, null is returned
*/
public User searchUsername(String username) {
User user = null;
 
try {
user = (User) session
.createQuery("FROM User " + "WHERE username = :username")
.setParameter("username", username).uniqueResult();
user = (User) session.createQuery(
"FROM User " +
"WHERE username = :username")
.setParameter("username", username)
.uniqueResult();
} catch (Exception e) {
// TODO: Log error
}
/trunk/src/struts.xml
3,7 → 3,7
"http://struts.apache.org/dtds/struts-2.0.dtd">
 
<struts>
<constant name="struts.devMode" value="true" /> <!-- activates debugging output -->
<constant name="struts.devMode" value="false" /> <!-- set to true for more debugging output -->
<!-- User environment -->
<package name="user" namespace="/user" extends="struts-default">
10,8 → 10,6
</package>
<!-- Admin environment -->
<package name="admin" namespace="/admin" extends="hibernate-default">
<action name="userAddForm">
18,22 → 16,15
<result>/admin/userAddForm.jsp</result>
</action>
<action name="doUserAdd" method="add" class="ch.ffhs.webE.action.UserAction">
<result name="success">/admin/userAdd.jsp</result>
<action name="doUserAdd" method="addForm" class="ch.ffhs.webE.action.UserAction">
<result name="success" type="redirect">/admin/userAdd.jsp</result>
</action>
<action name="userList" method="list" class="ch.ffhs.webE.action.UserAction">
<result name="success">/admin/userList.jsp</result>
<action name="userList">
<result>/admin/userList.jsp</result>
</action>
<action name="deleteUser" method="delete" class="ch.ffhs.webE.action.UserAction">
<result name="success" type="redirect">/admin/userList</result>
</action>
</package>
<!-- Remaining environment of the session-->
<package name="default" namespace="" extends="hibernate-default">