Subversion Repositories WebE

Compare Revisions

Last modification

Regard whitespace Rev 34 → Rev 33

/trunk/src/ch/ffhs/webE/action/RelationshipAction.java
File deleted
Property changes:
Deleted: svn:mime-type
## -1 +0,0 ##
-text/plain
\ No newline at end of property
Index: TermAction.java
===================================================================
--- TermAction.java (revision 34)
+++ TermAction.java (revision 33)
@@ -40,9 +40,6 @@
*/
Map<String, Object> session = ActionContext.getContext().getSession();
- private final HttpServletRequest request = (HttpServletRequest) ActionContext
- .getContext().get(StrutsStatics.HTTP_REQUEST);
-
/*
* (non-Javadoc)
*
@@ -58,18 +55,13 @@
*
* @return {@link Action#SUCCESS}
*/
- public String save()
+ public String add()
{
- if (!"1".equals(this.request.getParameter("edit")))
- {
User user = this.userDAO.searchUsername((String) this.session
.get("username"));
- ObjectEntity obj = new ObjectEntity(user,
- new ObjectType(ObjectType.TERM), user, null, new Date(), false,
- this.term, null, null);
+ ObjectEntity obj = new ObjectEntity(user, new ObjectType(ObjectType.TERM),
+ user, null, new Date(), false, this.term, null, null);
this.term.setObject(obj);
- }
-
if (this.termDAO.saveOrUpdate(this.term))
{
return Action.SUCCESS;
@@ -85,7 +77,7 @@
*/
public String list()
{
- this.termList = this.termDAO.getTerms();
+ this.termList = this.termDAO.listTerm();
return Action.SUCCESS;
}
@@ -102,7 +94,6 @@
this.term = this.termDAO.getTermById(id);
if (this.term != null)
{
- this.term.edit = true;
return Action.SUCCESS;
}
}
@@ -117,10 +108,13 @@
*/
private int getIdParameter()
{
+ HttpServletRequest request = (HttpServletRequest) ActionContext
+ .getContext().get(StrutsStatics.HTTP_REQUEST);
+
int id = -1;
try
{
- id = Integer.parseInt(this.request.getParameter("id")); //$NON-NLS-1$
+ id = Integer.parseInt(request.getParameter("id")); //$NON-NLS-1$
}
catch (Exception e)
{
/trunk/src/ch/ffhs/webE/action/RelationshipTypeAction.java
5,13 → 5,12
 
import javax.servlet.http.HttpServletRequest;
 
import org.apache.struts2.StrutsStatics;
import org.apache.struts2.ServletActionContext;
 
import ch.ffhs.webE.dao.RelationshipTypeDAO;
import ch.ffhs.webE.dao.RelationshipTypeDAOImpl;
import ch.ffhs.webE.domain.RelationshipType;
 
import com.opensymphony.xwork2.Action;
import com.opensymphony.xwork2.ActionContext;
import com.opensymphony.xwork2.ActionSupport;
import com.opensymphony.xwork2.ModelDriven;
24,38 → 23,38
 
private RelationshipType relType = new RelationshipType();
private List<RelationshipType> relTypeList = new ArrayList<RelationshipType>();
private final RelationshipTypeDAO relTypeDAO = new RelationshipTypeDAOImpl();
private RelationshipTypeDAO relTypeDAO = new RelationshipTypeDAOImpl();
 
@Override
public RelationshipType getModel()
{
return this.relType;
return relType;
}
 
public String addOrUpdate()
{
this.relTypeDAO.saveOrUpdateRelType(this.relType);
return Action.SUCCESS;
relTypeDAO.saveOrUpdateRelType(relType);
return SUCCESS;
}
 
public String list()
{
this.relTypeList = this.relTypeDAO.getRelTypes();
return Action.SUCCESS;
relTypeList = relTypeDAO.listRelationshipTypes();
return SUCCESS;
}
 
public String edit()
{
int id = this.getIdParameter();
int id = getIdParameter();
 
if (id > 0)
{
this.relType = this.relTypeDAO.getRelTypeById(id);
return Action.SUCCESS;
relType = relTypeDAO.listRelTypeById(id);
return SUCCESS;
}
else
{
return Action.ERROR;
return ERROR;
}
}
 
67,7 → 66,7
private int getIdParameter()
{
HttpServletRequest request = (HttpServletRequest) ActionContext
.getContext().get(StrutsStatics.HTTP_REQUEST);
.getContext().get(ServletActionContext.HTTP_REQUEST);
 
int id = -1;
try
90,17 → 89,17
*/
public String delete()
{
int id = this.getIdParameter();
int id = getIdParameter();
 
// Check for malicious ID values
if (id > 0)
{
this.relTypeDAO.deleteRelationshipType(id);
return Action.SUCCESS;
relTypeDAO.deleteRelationshipType(id);
return SUCCESS;
}
else
{
return Action.ERROR;
return ERROR;
}
}
 
110,7 → 109,7
 
public RelationshipType getRelType()
{
return this.relType;
return relType;
}
 
public void setRelType(RelationshipType relType)
120,7 → 119,7
 
public List<RelationshipType> getRelTypeList()
{
return this.relTypeList;
return relTypeList;
}
 
public void setRelTypeList(List<RelationshipType> relTypeList)