Author: dsvyatobatsko Date: 2009-01-20 13:12:56 -0500 (Tue, 20 Jan 2009) New Revision: 12353 Modified: trunk/test-applications/seleniumTest/richfaces/src/main/java/org/ajax4jsf/bean/TemplateBean.java Log: moved to paths based on doc root Modified: trunk/test-applications/seleniumTest/richfaces/src/main/java/org/ajax4jsf/bean/TemplateBean.java =================================================================== --- trunk/test-applications/seleniumTest/richfaces/src/main/java/org/ajax4jsf/bean/TemplateBean.java 2009-01-20 16:49:29 UTC (rev 12352) +++ trunk/test-applications/seleniumTest/richfaces/src/main/java/org/ajax4jsf/bean/TemplateBean.java 2009-01-20 18:12:56 UTC (rev 12353) @@ -35,36 +35,36 @@ import org.apache.commons.logging.LogFactory; public class TemplateBean { - - private static final Log log = LogFactory.getLog(TemplateBean.class); - - static final List<String> dataTableModel = new ArrayList<String>(); - static { - dataTableModel.add("1"); - dataTableModel.add("2"); - } - + + private static final Log log = LogFactory.getLog(TemplateBean.class); + + static final List<String> dataTableModel = new ArrayList<String>(); + static { + dataTableModel.add("1"); + dataTableModel.add("2"); + } + public static final String PARAM_NAME = "t"; - + private Template template = Template.SIMPLE; - + private Template templatePath = Template.SIMPLE; - + private String methodName; - + private Integer dataTableRowIndex = 0; - - public String getTemplateId() { + + public String getTemplateId() { return template.toString(); } - + public void setTemplateId(String template) { - this.template = Template.valueOf(template); - if (this.template.equals(Template.DATA_TABLE)) { - dataTableRowIndex = 0; - }else if (this.template.equals(Template.DATA_TABLE2)) { - dataTableRowIndex = 1; - } + this.template = Template.valueOf(template); + if (this.template.equals(Template.DATA_TABLE)) { + dataTableRowIndex = 0; + } else if (this.template.equals(Template.DATA_TABLE2)) { + dataTableRowIndex = 1; + } } @@ -76,16 +76,16 @@ * @return the template */ public String getTemplate() { - return "../../template/" + template.getName() + ".xhtml"; + return "/template/" + template.getName() + ".xhtml"; } - + /** * @return the template */ public String getAutoTestTemplate() { - return "../../template/autotest/" + template.getName() + ".xhtml"; + return "/template/autotest/" + template.getName() + ".xhtml"; } - + /** * @return the template */ @@ -100,7 +100,7 @@ public void setTemplate(Template template) { this.template = template; } - + public void setTemplatePath(Template templatePath) { this.templatePath = templatePath; } @@ -113,62 +113,58 @@ return retVal; } - + /** * Invokes reset method of appropriate backing bean + * * @param actionEvent */ public void reset(ActionEvent actionEvent) { - FacesContext context = FacesContext.getCurrentInstance(); - if (context != null) { - if (methodName != null && methodName.trim().length() > 0 && !"null".equals(methodName)) { - try { - ExpressionFactory factory = context.getApplication() - .getExpressionFactory(); - if (factory != null) { - MethodExpression methodExpression = factory - .createMethodExpression(context.getELContext(), - methodName, Void.class, new Class[] {}); - methodExpression.invoke(context.getELContext(), - new Object[] {}); - } - } catch (Exception e) { - log.error( - "Reset method has not been found by this expression: " - + methodName, e); - } - } - } + FacesContext context = FacesContext.getCurrentInstance(); + if (context != null) { + if (methodName != null && methodName.trim().length() > 0 && !"null".equals(methodName)) { + try { + ExpressionFactory factory = context.getApplication().getExpressionFactory(); + if (factory != null) { + MethodExpression methodExpression = factory.createMethodExpression(context.getELContext(), + methodName, Void.class, new Class[] {}); + methodExpression.invoke(context.getELContext(), new Object[] {}); + } + } catch (Exception e) { + log.error("Reset method has not been found by this expression: " + methodName, e); + } + } + } - } + } - /** - * @return the methodName - */ - public String getMethodName() { - return methodName; - } + /** + * @return the methodName + */ + public String getMethodName() { + return methodName; + } - /** - * @param methodName the methodName to set - */ - public void setMethodName(String methodName) { - this.methodName = methodName; - } + /** + * @param methodName + * the methodName to set + */ + public void setMethodName(String methodName) { + this.methodName = methodName; + } - /** - * @return the dataTableRowIndex - */ - public Integer getDataTableRowIndex() { - return dataTableRowIndex; - } + /** + * @return the dataTableRowIndex + */ + public Integer getDataTableRowIndex() { + return dataTableRowIndex; + } - /** - * @return the dataTableModel - */ - public List<String> getDataTableModel() { - return dataTableModel; - } + /** + * @return the dataTableModel + */ + public List<String> getDataTableModel() { + return dataTableModel; + } - } \ No newline at end of file