user and relationship type now editable and removeable. Generic error page for admin site
/trunk/src/ch/ffhs/webE/dao/UserDAOImpl.java |
---|
38,8 → 38,7 |
e.printStackTrace(); |
} |
// If no user was checked, return an empty list to mitigate null pointer |
// exceptions |
//If no user was checked, return an empty list to mitigate null pointer exceptions |
if (user == null) |
{ |
user = new ArrayList<User>(); |
55,11 → 54,11 |
* @return void |
*/ |
@Override |
public void saveOrUpdateUser(User user) |
public void saveUser(User user) |
{ |
try |
{ |
session.saveOrUpdate(user); |
session.save(user); |
} |
catch (Exception e) |
{ |
100,7 → 99,7 |
{ |
User user = null; |
// Exec query |
//Exec query |
try |
{ |
user = (User) session |
113,22 → 112,4 |
} |
return user; |
} |
/** |
* Used to list a single user by Id. |
*/ |
@Override |
public User listUserById(int userId) |
{ |
User user = null; |
try |
{ |
user = (User) session.get(User.class, userId); |
} |
catch (Exception e) |
{ |
e.printStackTrace(); |
} |
return user; |
} |
} |
} |
/trunk/src/ch/ffhs/webE/dao/RelationshipTypeDAO.java |
---|
8,9 → 8,8 |
List<RelationshipType> listRelationshipTypes(); |
boolean saveRelationshipType(RelationshipType relType); |
boolean deleteRelationshipType(int relTypeID); |
RelationshipType listRelTypeById(int relTypeID); |
boolean saveOrUpdateRelType(RelationshipType relType); |
} |
/trunk/src/ch/ffhs/webE/dao/RelationshipTypeDAOImpl.java |
---|
57,11 → 57,11 |
* relationshipType |
*/ |
@Override |
public boolean saveOrUpdateRelType(RelationshipType relType) |
public boolean saveRelationshipType(RelationshipType relType) |
{ |
try |
{ |
session.saveOrUpdate(relType); |
session.save(relType); |
return true; |
} |
catch (Exception e) |
83,9 → 83,8 |
{ |
try |
{ |
RelationshipType relType = (RelationshipType) session.get( |
RelationshipType.class, relTypeID); |
session.delete(relType); |
User user = (User) session.get(RelationshipType.class, relTypeID); |
session.delete(user); |
return true; |
} |
catch (Exception e) |
95,24 → 94,4 |
return false; |
} |
} |
/** |
* Used to get a relationship type by ID |
*/ |
@Override |
public RelationshipType listRelTypeById(int relTypeID) |
{ |
RelationshipType relType = null; |
try |
{ |
relType = (RelationshipType) session.get(RelationshipType.class, |
relTypeID); |
} |
catch (Exception e) |
{ |
e.printStackTrace(); |
// TODO: Logging |
} |
return relType; |
} |
} |
/trunk/src/ch/ffhs/webE/dao/UserDAO.java |
---|
4,16 → 4,10 |
import ch.ffhs.webE.domain.User; |
public interface UserDAO |
{ |
public interface UserDAO { |
List<User> listUser(); |
User searchUsername(String username); |
void deleteUser(int userId); |
User listUserById(int userId); |
void saveOrUpdateUser(User user); |
List<User> listUser(); |
void saveUser(User user); |
User searchUsername(String username); |
void deleteUser(int userId); |
} |