Author: maksimkaszynski Date: 2007-09-28 07:40:53 -0400 (Fri, 28 Sep 2007) New Revision: 3163 Modified: trunk/framework/impl/src/main/java/org/ajax4jsf/event/EventsQueue.java trunk/samples/calendar-sample/src/main/java/org/richfaces/CalendarDataModelImpl.java trunk/ui/menu-components/src/test/java/org/richfaces/component/MenuItemComponentTest.java trunk/ui/panelbar/src/test/java/org/richfaces/component/PanelBarComponentTest.java trunk/ui/scrollableDataTable/src/main/java/org/richfaces/renderkit/html/ScrollableDataTableBaseRenderer.java trunk/ui/scrollableDataTable/src/main/javascript/ClientUI/controls/grid/Grid.js trunk/ui/togglePanel/src/test/java/org/richfaces/component/TogglePanelComponentTest.java trunk/ui/tree/src/test/java/org/richfaces/component/events/TreeEventsTest.java Log: fixed build Modified: trunk/framework/impl/src/main/java/org/ajax4jsf/event/EventsQueue.java =================================================================== --- trunk/framework/impl/src/main/java/org/ajax4jsf/event/EventsQueue.java 2007-09-27 23:29:10 UTC (rev 3162) +++ trunk/framework/impl/src/main/java/org/ajax4jsf/event/EventsQueue.java 2007-09-28 11:40:53 UTC (rev 3163) @@ -3,10 +3,7 @@ */ package org.ajax4jsf.event; -import java.util.Collection; -import java.util.Iterator; import java.util.NoSuchElementException; -import java.util.Queue; import javax.faces.event.FacesEvent; @@ -21,6 +18,8 @@ private QueueElement last; + private int size = 0; + /** * Remove and return first queued event. * @return faces event form top of queue @@ -31,10 +30,11 @@ throw new NoSuchElementException("Events queue is empty"); } FacesEvent element = first.getElement(); - first = first.getPrevisious(); + first = first.getPrevious(); if(null == first){ last = null; } + size--; return element; } @@ -47,22 +47,28 @@ if(isEmpty()){ first = last = queueElement; } else { - last.setPrevisious(queueElement); + last.setPrevious(queueElement); last = queueElement; } + size++; } public void clear() { + size = 0; first = last = null; } public boolean isEmpty() { return null == first; } + + public int size() { + return size; + } private static class QueueElement { - private QueueElement previsious; + private QueueElement previous; private FacesEvent element; @@ -72,18 +78,18 @@ /** - * @param previsious the previsious to set + * @param previous the previous to set */ - public void setPrevisious(QueueElement previsious) { - this.previsious = previsious; + public void setPrevious(QueueElement previsious) { + this.previous = previsious; } /** - * @return the previsious + * @return the previous */ - public QueueElement getPrevisious() { - return previsious; + public QueueElement getPrevious() { + return previous; } /** Modified: trunk/samples/calendar-sample/src/main/java/org/richfaces/CalendarDataModelImpl.java =================================================================== --- trunk/samples/calendar-sample/src/main/java/org/richfaces/CalendarDataModelImpl.java 2007-09-27 23:29:10 UTC (rev 3162) +++ trunk/samples/calendar-sample/src/main/java/org/richfaces/CalendarDataModelImpl.java 2007-09-28 11:40:53 UTC (rev 3163) @@ -26,6 +26,7 @@ import java.util.HashMap; import java.util.Locale; import java.util.Map; +import java.util.Random; import org.richfaces.model.CalendarDataModel; import org.richfaces.model.CalendarDataModelItem; @@ -62,8 +63,18 @@ data.put("enLabel", enFormatter.format(date)); data.put("frLabel", frFormatter.format(date)); data.put("deLabel", deFormatter.format(date)); + + + if (new Random().nextInt(10) > 5) { + item.setEnabled(true); + } else { + item.setEnabled(false); + } + item.setData(data); - + + System.out.println(item.getData() + " " + item.isEnabled()); + return item; } Modified: trunk/ui/menu-components/src/test/java/org/richfaces/component/MenuItemComponentTest.java =================================================================== --- trunk/ui/menu-components/src/test/java/org/richfaces/component/MenuItemComponentTest.java 2007-09-27 23:29:10 UTC (rev 3162) +++ trunk/ui/menu-components/src/test/java/org/richfaces/component/MenuItemComponentTest.java 2007-09-28 11:40:53 UTC (rev 3163) @@ -33,6 +33,7 @@ import javax.faces.event.PhaseId; import javax.servlet.http.HttpServletResponse; +import org.ajax4jsf.event.EventsQueue; import org.ajax4jsf.resource.InternetResource; import org.ajax4jsf.resource.InternetResourceBuilder; import org.ajax4jsf.resource.ResourceBuilderImpl; @@ -319,7 +320,7 @@ menuItem.decode(facesContext); MockViewRoot mockViewRoot = (MockViewRoot) facesContext.getViewRoot(); - Buffer events = mockViewRoot.getEventsQueue(facesContext, + EventsQueue events = mockViewRoot.getEventsQueue(facesContext, PhaseId.APPLY_REQUEST_VALUES); assertNotNull(events); assertEquals(1, events.size()); @@ -338,7 +339,7 @@ menuItem.decode(facesContext); MockViewRoot mockViewRoot = (MockViewRoot) facesContext.getViewRoot(); - Buffer events = mockViewRoot.getEventsQueue(facesContext, + EventsQueue events = mockViewRoot.getEventsQueue(facesContext, PhaseId.INVOKE_APPLICATION); assertNotNull(events); assertEquals(1, events.size()); Modified: trunk/ui/panelbar/src/test/java/org/richfaces/component/PanelBarComponentTest.java =================================================================== --- trunk/ui/panelbar/src/test/java/org/richfaces/component/PanelBarComponentTest.java 2007-09-27 23:29:10 UTC (rev 3162) +++ trunk/ui/panelbar/src/test/java/org/richfaces/component/PanelBarComponentTest.java 2007-09-28 11:40:53 UTC (rev 3163) @@ -31,9 +31,9 @@ import javax.faces.event.FacesEvent; import javax.faces.event.PhaseId; +import org.ajax4jsf.event.EventsQueue; import org.ajax4jsf.tests.AbstractAjax4JsfTestCase; import org.ajax4jsf.tests.MockViewRoot; -import org.apache.commons.collections.Buffer; import org.apache.commons.lang.StringUtils; import org.richfaces.component.html.HtmlPanelBar; import org.richfaces.component.html.HtmlPanelBarItem; @@ -255,12 +255,12 @@ panelBar.decode(facesContext); MockViewRoot mockViewRoot = (MockViewRoot) facesContext.getViewRoot(); - Buffer events = mockViewRoot.getEventsQueue(facesContext, + EventsQueue events = mockViewRoot.getEventsQueue(facesContext, PhaseId.APPLY_REQUEST_VALUES); assertNotNull(events); assertEquals(1, events.size()); - FacesEvent event = (FacesEvent) events.iterator().next(); + FacesEvent event = (FacesEvent) events.remove(); assertTrue(event instanceof SwitchablePanelSwitchEvent); SwitchablePanelSwitchEvent switchEvent = (SwitchablePanelSwitchEvent) event; assertEquals(switchEvent.getValue(), "Swich"); @@ -275,7 +275,7 @@ panelBar.decode(facesContext); MockViewRoot mockViewRoot = (MockViewRoot) facesContext.getViewRoot(); - Buffer events = mockViewRoot.getEventsQueue(facesContext, + EventsQueue events = mockViewRoot.getEventsQueue(facesContext, PhaseId.INVOKE_APPLICATION); assertNotNull(events); assertEquals(0, events.size()); Modified: trunk/ui/scrollableDataTable/src/main/java/org/richfaces/renderkit/html/ScrollableDataTableBaseRenderer.java =================================================================== --- trunk/ui/scrollableDataTable/src/main/java/org/richfaces/renderkit/html/ScrollableDataTableBaseRenderer.java 2007-09-27 23:29:10 UTC (rev 3162) +++ trunk/ui/scrollableDataTable/src/main/java/org/richfaces/renderkit/html/ScrollableDataTableBaseRenderer.java 2007-09-28 11:40:53 UTC (rev 3163) @@ -41,18 +41,18 @@ public abstract class ScrollableDataTableBaseRenderer extends CompositeRenderer { - public final String PARTIAL_UPDATE= "partialUpdate"; - public final String UPDATE_HEADER = "updateHeader"; + public static final String PARTIAL_UPDATE = "partialUpdate"; + public static final String UPDATE_HEADER = "updateHeader"; - public final String FOOTER_PART = "footer"; + public static final String FOOTER_PART = "footer"; - public final String HEADER_PART = "header"; + public static final String HEADER_PART = "header"; - private final String COLUMN_FROZEN_TYPE = "frozen"; + private static final String COLUMN_FROZEN_TYPE = "frozen"; - private final String COLUMN_NORMAL_TYPE = "normal"; + private static final String COLUMN_NORMAL_TYPE = "normal"; - private final String PERSENTAGE_SUPPORT_ERROR_MSG = "columnsWidth property: Percentage values are not supported"; + private static final String PERSENTAGE_SUPPORT_ERROR_MSG = "columnsWidth property: Percentage values are not supported"; private RendererBase cellTemplate = null; Modified: trunk/ui/scrollableDataTable/src/main/javascript/ClientUI/controls/grid/Grid.js =================================================================== --- trunk/ui/scrollableDataTable/src/main/javascript/ClientUI/controls/grid/Grid.js 2007-09-27 23:29:10 UTC (rev 3162) +++ trunk/ui/scrollableDataTable/src/main/javascript/ClientUI/controls/grid/Grid.js 2007-09-28 11:40:53 UTC (rev 3163) @@ -179,8 +179,8 @@ }, quickFind: function(column, text, startRow) { var start = startRow || 0; - var searchText = "*" + text + "*"; - searchText = searchText.replace(/\*/g, ".*"); + var searchText = ".*" + text + ".*"; + //searchText = searchText.replace(/\*/g, ".*"); var searchReg = new RegExp(searchText, 'i'); var rowIndex = -1; var body = this.getBody(); Modified: trunk/ui/togglePanel/src/test/java/org/richfaces/component/TogglePanelComponentTest.java =================================================================== --- trunk/ui/togglePanel/src/test/java/org/richfaces/component/TogglePanelComponentTest.java 2007-09-27 23:29:10 UTC (rev 3162) +++ trunk/ui/togglePanel/src/test/java/org/richfaces/component/TogglePanelComponentTest.java 2007-09-28 11:40:53 UTC (rev 3163) @@ -21,14 +21,10 @@ package org.richfaces.component; -import com.gargoylesoftware.htmlunit.html.HtmlElement; -import com.gargoylesoftware.htmlunit.html.HtmlPage; -import com.gargoylesoftware.htmlunit.html.HtmlScript; -import org.richfaces.event.SwitchablePanelSwitchEvent; -import org.ajax4jsf.tests.AbstractAjax4JsfTestCase; -import org.ajax4jsf.tests.MockViewRoot; -import org.apache.commons.collections.Buffer; -import org.apache.commons.lang.StringUtils; +import java.util.HashSet; +import java.util.Iterator; +import java.util.List; +import java.util.Set; import javax.faces.FacesException; import javax.faces.component.UIComponent; @@ -38,11 +34,16 @@ import javax.faces.event.FacesEvent; import javax.faces.event.PhaseId; -import java.util.HashSet; -import java.util.Iterator; -import java.util.List; -import java.util.Set; +import org.ajax4jsf.event.EventsQueue; +import org.ajax4jsf.tests.AbstractAjax4JsfTestCase; +import org.ajax4jsf.tests.MockViewRoot; +import org.apache.commons.lang.StringUtils; +import org.richfaces.event.SwitchablePanelSwitchEvent; +import com.gargoylesoftware.htmlunit.html.HtmlElement; +import com.gargoylesoftware.htmlunit.html.HtmlPage; +import com.gargoylesoftware.htmlunit.html.HtmlScript; + /** * Unit test for Datascroller component. */ @@ -331,12 +332,12 @@ toggleControl.decode(facesContext); MockViewRoot mockViewRoot = (MockViewRoot) facesContext.getViewRoot(); - Buffer events = mockViewRoot.getEventsQueue(facesContext, + EventsQueue events = mockViewRoot.getEventsQueue(facesContext, PhaseId.APPLY_REQUEST_VALUES); assertNotNull(events); assertEquals(2, events.size()); - FacesEvent event = (FacesEvent) events.iterator().next(); + FacesEvent event = (FacesEvent) events.remove(); assertTrue(event instanceof SwitchablePanelSwitchEvent); SwitchablePanelSwitchEvent switchEvent = (SwitchablePanelSwitchEvent) event; assertEquals(switchEvent.getValue(), "ABYBC"); @@ -346,7 +347,7 @@ assertNotNull(events); assertEquals(1, events.size()); - event = (FacesEvent) events.iterator().next(); + event = (FacesEvent) events.remove(); assertTrue(event instanceof ActionEvent); ActionEvent actionEvent = (ActionEvent) event; @@ -366,7 +367,7 @@ togglePanel.decode(facesContext); MockViewRoot mockViewRoot = (MockViewRoot) facesContext.getViewRoot(); - Buffer events = mockViewRoot.getEventsQueue(facesContext, + EventsQueue events = mockViewRoot.getEventsQueue(facesContext, PhaseId.INVOKE_APPLICATION); assertNotNull(events); assertEquals(0, events.size()); Modified: trunk/ui/tree/src/test/java/org/richfaces/component/events/TreeEventsTest.java =================================================================== --- trunk/ui/tree/src/test/java/org/richfaces/component/events/TreeEventsTest.java 2007-09-27 23:29:10 UTC (rev 3162) +++ trunk/ui/tree/src/test/java/org/richfaces/component/events/TreeEventsTest.java 2007-09-28 11:40:53 UTC (rev 3163) @@ -26,10 +26,10 @@ import javax.faces.event.FacesEvent; import javax.faces.event.FacesListener; +import org.ajax4jsf.event.EventsQueue; import org.ajax4jsf.tests.AbstractAjax4JsfTestCase; import org.ajax4jsf.tests.MockMethodBinding; import org.ajax4jsf.tests.MockViewRoot; -import org.apache.commons.collections.Buffer; import org.richfaces.component.UITree; import org.richfaces.component.UITreeNode; import org.richfaces.event.AjaxSelectedEvent; @@ -102,7 +102,7 @@ MockMethodBinding binding = new MockMethodBinding(); treeNode.setNodeSelectListener(binding); - Buffer events = mockViewRoot.getAjaxEventsQueue(facesContext); + EventsQueue events = mockViewRoot.getAjaxEventsQueue(facesContext); assertNotNull(events); assertEquals(0, events.size()); @@ -125,7 +125,7 @@ MockMethodBinding binding = new MockMethodBinding(); treeNode.setNodeSelectListener(binding); - Buffer events = mockViewRoot.getAjaxEventsQueue(facesContext); + EventsQueue events = mockViewRoot.getAjaxEventsQueue(facesContext); assertNotNull(events); assertEquals(0, events.size()); assertEquals(0, binding.getInvocationArgs().length);