Author: maksimkaszynski Date: 2008-02-13 05:52:39 -0500 (Wed, 13 Feb 2008) New Revision: 6045 Added: trunk/sandbox/samples/sortingFilteringDemo/src/main/webapp/META-INF/ trunk/sandbox/samples/sortingFilteringDemo/src/main/webapp/META-INF/MANIFEST.MF trunk/sandbox/samples/sortingFilteringDemo/src/main/webapp/WEB-INF/lib/ Modified: trunk/samples/jira-data/src/main/java/org/richfaces/demo/datagrid/model/Channel.java trunk/samples/jira-data/src/main/java/org/richfaces/demo/datagrid/service/JiraService.java trunk/sandbox/samples/sortingFilteringDemo/src/main/webapp/WEB-INF/web.xml trunk/sandbox/samples/sortingFilteringDemo/src/main/webapp/pages/index.jsp trunk/ui/dataTable/src/main/templates/org/richfaces/htmlDataTable.jspx Log: sumbitted minor changes to jira-data project Modified: trunk/samples/jira-data/src/main/java/org/richfaces/demo/datagrid/model/Channel.java =================================================================== --- trunk/samples/jira-data/src/main/java/org/richfaces/demo/datagrid/model/Channel.java 2008-02-13 09:00:24 UTC (rev 6044) +++ trunk/samples/jira-data/src/main/java/org/richfaces/demo/datagrid/model/Channel.java 2008-02-13 10:52:39 UTC (rev 6045) @@ -132,7 +132,7 @@ }; }; - + private int maxSize; private List<Issue> issues = new ArrayList<Issue>(); private String title; private String description; @@ -141,9 +141,11 @@ private Map <Integer, Issue> index = new HashMap<Integer, Issue>(); + public Channel(int maxSize) { + this.maxSize = maxSize; + } - public int size() { return issues.size(); } @@ -235,9 +237,11 @@ } public void addIssue(Issue issue) { - if (issues.size() > 5) { + + if (maxSize >= 0 && issues.size() > maxSize) { return; } + issues.add(issue); index.put(issue.getIndex(), issue); } Modified: trunk/samples/jira-data/src/main/java/org/richfaces/demo/datagrid/service/JiraService.java =================================================================== --- trunk/samples/jira-data/src/main/java/org/richfaces/demo/datagrid/service/JiraService.java 2008-02-13 09:00:24 UTC (rev 6044) +++ trunk/samples/jira-data/src/main/java/org/richfaces/demo/datagrid/service/JiraService.java 2008-02-13 10:52:39 UTC (rev 6045) @@ -17,6 +17,7 @@ import javax.el.ELContext; import javax.el.ELResolver; +import javax.faces.context.ExternalContext; import javax.faces.context.FacesContext; import org.apache.commons.beanutils.PropertyUtils; @@ -42,6 +43,8 @@ */ public class JiraService { + public static final String ORG_RICHFACES_ISSUES = "org.richfaces.demo.MAX_ISSUES"; + private static final String KEY = "jiraService"; private static final Log log = LogFactory.getLog(JiraService.class); @@ -95,7 +98,21 @@ private void init() { System.out.println("JiraService.init()"); - channel = new Channel(); + + FacesContext context = FacesContext.getCurrentInstance(); + ExternalContext externalContext = context.getExternalContext(); + String string = + externalContext.getInitParameter(ORG_RICHFACES_ISSUES); + + int defaultSize = -1; + try { + defaultSize = Integer.parseInt(string); + } catch (Exception e) { + System.out.println("Parameter " + ORG_RICHFACES_ISSUES + " not defined. Using default value -1."); + } + + + channel = new Channel(defaultSize); Digester digester = new Digester(); digester.setValidating(false); digester.setNamespaceAware(false); Added: trunk/sandbox/samples/sortingFilteringDemo/src/main/webapp/META-INF/MANIFEST.MF =================================================================== --- trunk/sandbox/samples/sortingFilteringDemo/src/main/webapp/META-INF/MANIFEST.MF (rev 0) +++ trunk/sandbox/samples/sortingFilteringDemo/src/main/webapp/META-INF/MANIFEST.MF 2008-02-13 10:52:39 UTC (rev 6045) @@ -0,0 +1,3 @@ +Manifest-Version: 1.0 +Class-Path: + Property changes on: trunk/sandbox/samples/sortingFilteringDemo/src/main/webapp/META-INF/MANIFEST.MF ___________________________________________________________________ Name: svn:mime-type + text/plain Modified: trunk/sandbox/samples/sortingFilteringDemo/src/main/webapp/WEB-INF/web.xml =================================================================== --- trunk/sandbox/samples/sortingFilteringDemo/src/main/webapp/WEB-INF/web.xml 2008-02-13 09:00:24 UTC (rev 6044) +++ trunk/sandbox/samples/sortingFilteringDemo/src/main/webapp/WEB-INF/web.xml 2008-02-13 10:52:39 UTC (rev 6045) @@ -10,6 +10,10 @@ <param-name>javax.faces.STATE_SAVING_METHOD</param-name> <param-value>server</param-value> </context-param> + <context-param> + <param-name>org.richfaces.demo.MAX_ISSUES</param-name> + <param-value>1000</param-value> + </context-param> <!-- --> <filter> Modified: trunk/sandbox/samples/sortingFilteringDemo/src/main/webapp/pages/index.jsp =================================================================== --- trunk/sandbox/samples/sortingFilteringDemo/src/main/webapp/pages/index.jsp 2008-02-13 09:00:24 UTC (rev 6044) +++ trunk/sandbox/samples/sortingFilteringDemo/src/main/webapp/pages/index.jsp 2008-02-13 10:52:39 UTC (rev 6045) @@ -8,32 +8,34 @@ </head> <body> <f:view> - <dt:dataTable value="#{jiraService.issues}" var="issue"> - <dt:column> - <f:facet name="header"> - <h:outputText value="Key"></h:outputText> - </f:facet> - <h:outputText value="#{issue.key}"></h:outputText> - </dt:column> - <dt:column> - <f:facet name="header"> - <h:outputText value="Summary"></h:outputText> - </f:facet> - <h:outputText value="#{issue.summary}"></h:outputText> - </dt:column> - <dt:column> - <f:facet name="header"> - <h:outputText value="Assignee"></h:outputText> - </f:facet> - <h:outputText value="#{issue.assignee.name}"></h:outputText> - </dt:column> - <dt:column> - <f:facet name="header"> - <h:outputText value="Reporter"></h:outputText> - </f:facet> - <h:outputText value="#{issue.assignee.name}"></h:outputText> - </dt:column> - </dt:dataTable> + <h:form> + <dt:dataTable value="#{jiraService.channel.issues}" var="issue"> + <dt:column filterBy="#{issue.key.value}"> + <f:facet name="header"> + <h:outputText value="Key"></h:outputText> + </f:facet> + <h:outputText value="#{issue.key.value}"></h:outputText> + </dt:column> + <dt:column filterBy="#{issue.summary}" sortExpression="#{issues.summary}"> + <f:facet name="header"> + <h:outputText value="Summary"></h:outputText> + </f:facet> + <h:outputText value="#{issue.summary}"></h:outputText> + </dt:column> + <dt:column> + <f:facet name="header"> + <h:outputText value="Assignee"></h:outputText> + </f:facet> + <h:outputText value="#{issue.assignee.name}"></h:outputText> + </dt:column> + <dt:column> + <f:facet name="header"> + <h:outputText value="Reporter"></h:outputText> + </f:facet> + <h:outputText value="#{issue.reporter.name}"></h:outputText> + </dt:column> + </dt:dataTable> + </h:form> </f:view> </body> </html> Modified: trunk/ui/dataTable/src/main/templates/org/richfaces/htmlDataTable.jspx =================================================================== --- trunk/ui/dataTable/src/main/templates/org/richfaces/htmlDataTable.jspx 2008-02-13 09:00:24 UTC (rev 6044) +++ trunk/ui/dataTable/src/main/templates/org/richfaces/htmlDataTable.jspx 2008-02-13 10:52:39 UTC (rev 6045) @@ -13,6 +13,7 @@ component="org.richfaces.component.UIDataTable" <h:styles>css/table.xcss</h:styles> + <h:scripts>new org.ajax4jsf.javascript.AjaxScript()</h:scripts> <f:clientid var="clientId"/> <table id="#{clientId}" class="dr-table rich-table #{component.attributes['styleClass']}" style="#{component.attributes['style']}"