JBoss Rich Faces SVN: r4975 - trunk/sandbox/ui/combobox/src/main/java/org/richfaces/renderkit.
by richfaces-svn-commits＠lists.jboss.org
Author: abelevich
Date: 2007-12-22 08:57:22 -0500 (Sat, 22 Dec 2007)
New Revision: 4975
Added:
trunk/sandbox/ui/combobox/src/main/java/org/richfaces/renderkit/ComboBoxBaseRenderer.java
Log:
inititial
Added: trunk/sandbox/ui/combobox/src/main/java/org/richfaces/renderkit/ComboBoxBaseRenderer.java
===================================================================
--- trunk/sandbox/ui/combobox/src/main/java/org/richfaces/renderkit/ComboBoxBaseRenderer.java (rev 0)
+++ trunk/sandbox/ui/combobox/src/main/java/org/richfaces/renderkit/ComboBoxBaseRenderer.java 2007-12-22 13:57:22 UTC (rev 4975)
@@ -0,0 +1,55 @@
+package org.richfaces.renderkit;
+
+import java.io.IOException;
+import java.util.HashMap;
+import java.util.Map;
+
+import javax.faces.component.UIComponent;
+import javax.faces.context.FacesContext;
+import javax.faces.context.ResponseWriter;
+
+import org.ajax4jsf.javascript.JSFunction;
+import org.ajax4jsf.renderkit.HeaderResourcesRendererBase;
+import org.ajax4jsf.renderkit.RendererUtils.HTML;
+import org.richfaces.component.UIComboBox;
+
+/**
+ * @author Anton Belevich
+ *
+ */
+public class ComboBoxBaseRenderer extends HeaderResourcesRendererBase {
+
+ private static final String INPUT = "_input";
+
+ private static final String BUTTON = "_button";
+
+ protected Class getComponentClass() {
+ return UIComboBox.class;
+ }
+
+ private String getScript(FacesContext context, UIComponent component){
+ UIComboBox comboBox = (UIComboBox) component;
+ JSFunction function = new JSFunction("new Richfaces.Combobox");
+ String clientId = comboBox.getClientId(context);
+ function.addParameter(clientId);
+ Map options = new HashMap();
+ options.put("input", clientId + INPUT);
+ options.put("button", BUTTON);
+ function.addParameter(options);
+ return function.toString() ;
+ }
+
+ protected void doEncodeEnd(ResponseWriter writer, FacesContext context, UIComponent component) throws IOException {
+ super.doEncodeEnd(writer, context, component);
+ writer.startElement(HTML.SCRIPT_ELEM, component);
+ writer.writeText(getScript(context, component), "script");
+ writer.endElement(HTML.SCRIPT_ELEM);
+
+ }
+
+ protected void doEncodeChildren(ResponseWriter writer,
+ FacesContext context, UIComponent component) throws IOException {
+ // TODO Auto-generated method stub
+ super.doEncodeChildren(writer, context, component);
+ }
+}
16 years, 9 months
JBoss Rich Faces SVN: r4974 - in trunk/sandbox/ui/combobox/src/main: java/org/richfaces/component and 1 other directories.
by richfaces-svn-commits＠lists.jboss.org
Author: abelevich
Date: 2007-12-22 08:52:27 -0500 (Sat, 22 Dec 2007)
New Revision: 4974
Modified:
trunk/sandbox/ui/combobox/src/main/config/component/combobox.xml
trunk/sandbox/ui/combobox/src/main/java/org/richfaces/component/UIComboBox.java
trunk/sandbox/ui/combobox/src/main/resources/org/richfaces/renderkit/html/scripts/combobox.js
Log:
Modified: trunk/sandbox/ui/combobox/src/main/config/component/combobox.xml
===================================================================
--- trunk/sandbox/ui/combobox/src/main/config/component/combobox.xml 2007-12-22 12:48:22 UTC (rev 4973)
+++ trunk/sandbox/ui/combobox/src/main/config/component/combobox.xml 2007-12-22 13:52:27 UTC (rev 4974)
@@ -15,24 +15,17 @@
<description>
<![CDATA[ ]]>
</description>
-
- <renderer generate="false" override="false">
- <name>org.richfaces.ComboBox</name>
- <classname>
- org.richfaces.renderkit.html.ComboBoxRenderer
- </classname>
- </renderer>
+ <renderer generate="true" override="true">
+ <name>org.richfaces.renderkit.ComboBoxRenderer</name>
+ <template>combobox.jspx</template>
+ </renderer>
<tag>
<name>comboBox</name>
<classname>org.richfaces.taglib.ComboBoxTag</classname>
<superclass>
- org.richfaces.taglib.SuggestionBoxTag
+ org.ajax4jsf.webapp.taglib.HtmlComponentTagBase
</superclass>
</tag>
-
-
-
-
</component>
</components>
Modified: trunk/sandbox/ui/combobox/src/main/java/org/richfaces/component/UIComboBox.java
===================================================================
--- trunk/sandbox/ui/combobox/src/main/java/org/richfaces/component/UIComboBox.java 2007-12-22 12:48:22 UTC (rev 4973)
+++ trunk/sandbox/ui/combobox/src/main/java/org/richfaces/component/UIComboBox.java 2007-12-22 13:52:27 UTC (rev 4974)
@@ -5,26 +5,13 @@
import javax.faces.component.UIInput;
-import org.ajax4jsf.component.AjaxComponent;
-import org.ajax4jsf.event.AjaxListener;
-import org.ajax4jsf.event.AjaxSource;
-
/**
* UI implementation of ComboBox component
* @author Anton Belevich
*
*/
-public abstract class UIComboBox extends UIInput implements AjaxComponent, AjaxSource{
+public abstract class UIComboBox extends UIInput {
- public void addAjaxListener(final AjaxListener listener) {
- addFacesListener(listener);
- }
- public void removeAjaxListener(final AjaxListener listener) {
- removeFacesListener(listener);
- }
- public AjaxListener[] getAjaxListeners() {
- return (AjaxListener[])getFacesListeners(AjaxListener.class);
- }
}
Modified: trunk/sandbox/ui/combobox/src/main/resources/org/richfaces/renderkit/html/scripts/combobox.js
===================================================================
--- trunk/sandbox/ui/combobox/src/main/resources/org/richfaces/renderkit/html/scripts/combobox.js 2007-12-22 12:48:22 UTC (rev 4973)
+++ trunk/sandbox/ui/combobox/src/main/resources/org/richfaces/renderkit/html/scripts/combobox.js 2007-12-22 13:52:27 UTC (rev 4974)
@@ -0,0 +1,8 @@
+if (!window.Richfaces) window.Richfaces = {};
+Richfaces.ComboBox = Class.create();
+Richfaces.ComboBox.prototype = {
+ initialize: function(combobox, options) {
+
+ }
+
+};
16 years, 9 months
JBoss Rich Faces SVN: r4973 - trunk/samples/dataFilterSliderDemo/src/main/webapp/pages.
by richfaces-svn-commits＠lists.jboss.org
Author: sergeyhalipov
Date: 2007-12-22 07:48:22 -0500 (Sat, 22 Dec 2007)
New Revision: 4973
Modified:
trunk/samples/dataFilterSliderDemo/src/main/webapp/pages/index.jsp
Log:
Data filter slider demo, attribute names fixed.
Modified: trunk/samples/dataFilterSliderDemo/src/main/webapp/pages/index.jsp
===================================================================
--- trunk/samples/dataFilterSliderDemo/src/main/webapp/pages/index.jsp 2007-12-22 12:21:07 UTC (rev 4972)
+++ trunk/samples/dataFilterSliderDemo/src/main/webapp/pages/index.jsp 2007-12-22 12:48:22 UTC (rev 4973)
@@ -88,8 +88,8 @@
forValRef="inventoryList.carInventory"
filterBy="getMileage"
manualInput="true"
- onSlide="true"
- onChange="true"
+ onslide="true"
+ onchange="true"
storeResults="true"
trackStyleClass="track"
width="400px"
16 years, 9 months
JBoss Rich Faces SVN: r4972 - trunk/ui/drag-drop/src/main/resources/org/richfaces/renderkit/html/scripts.
by richfaces-svn-commits＠lists.jboss.org
Author: sergeyhalipov
Date: 2007-12-22 07:21:07 -0500 (Sat, 22 Dec 2007)
New Revision: 4972
Modified:
trunk/ui/drag-drop/src/main/resources/org/richfaces/renderkit/html/scripts/drag-indicator.js
Log:
http://jira.jboss.com/jira/browse/RF-1625
Modified: trunk/ui/drag-drop/src/main/resources/org/richfaces/renderkit/html/scripts/drag-indicator.js
===================================================================
--- trunk/ui/drag-drop/src/main/resources/org/richfaces/renderkit/html/scripts/drag-indicator.js 2007-12-22 11:56:40 UTC (rev 4971)
+++ trunk/ui/drag-drop/src/main/resources/org/richfaces/renderkit/html/scripts/drag-indicator.js 2007-12-22 12:21:07 UTC (rev 4972)
@@ -1,10 +1,13 @@
DragIndicator = {
init: function(event) {
- var ieVersion = RichFaces.getIEVersion();
- if (ieVersion && ieVersion < 7) {
- DragIndicator.isIE6 = true;
- }
+ DragIndicator.isIE = (RichFaces.MSIE == RichFaces.navigatorType());
+ if (DragIndicator.isIE) {
+ var ieVersion = RichFaces.getIEVersion();
+ if (ieVersion && ieVersion < 7) {
+ DragIndicator.isIE6 = true;
+ }
+ }
},
setContent: function(name, single, params) {
@@ -44,6 +47,14 @@
},
show: function() {
+ if (DragIndicator.isIE && !this.floatedToBody) {
+ if (!this.realParent) {
+ this.realParent = this.parentNode;
+ }
+ this.realParent.removeChild(this);
+ document.body.appendChild(this);
+ this.floatedToBody = true;
+ }
Element.show(this);
this.style.position = 'absolute';
},
@@ -53,6 +64,11 @@
this.style.position = '';
this.offsets = undefined;
this.leave();
+ if (DragIndicator.isIE && this.floatedToBody && this.realParent) {
+ document.body.removeChild(this);
+ this.realParent.appendChild(this);
+ this.floatedToBody = false;
+ }
},
position: function(x, y) {
@@ -60,11 +76,14 @@
Element.show(this);
this.style.position = 'absolute';
- this.offsets = Position.cumulativeOffset(this);
- this.offsets[0] -= this.offsetLeft || 0;
- this.offsets[1] -= this.offsetTop || 0;
+ if (!DragIndicator.isIE) {
+ this.offsets = Position.cumulativeOffset(this);
+ this.offsets[0] -= this.offsetLeft || 0;
+ this.offsets[1] -= this.offsetTop || 0;
+ } else {
+ this.offsets = [0, 0];
+ }
}
-
Element.setStyle(this, {"left": - this.offsets[0] + x + "px", "top": - this.offsets[1] + y + "px"});
},
16 years, 9 months
JBoss Rich Faces SVN: r4971 - trunk/framework/test/src/main/java/org/ajax4jsf/tests.
by richfaces-svn-commits＠lists.jboss.org
Author: andrei_exadel
Date: 2007-12-22 06:56:40 -0500 (Sat, 22 Dec 2007)
New Revision: 4971
Added:
trunk/framework/test/src/main/java/org/ajax4jsf/tests/MockELContext.java
trunk/framework/test/src/main/java/org/ajax4jsf/tests/MockPageContext.java
trunk/framework/test/src/main/java/org/ajax4jsf/tests/MockValueExpression.java
Log:
add jsp mockups
Added: trunk/framework/test/src/main/java/org/ajax4jsf/tests/MockELContext.java
===================================================================
--- trunk/framework/test/src/main/java/org/ajax4jsf/tests/MockELContext.java (rev 0)
+++ trunk/framework/test/src/main/java/org/ajax4jsf/tests/MockELContext.java 2007-12-22 11:56:40 UTC (rev 4971)
@@ -0,0 +1,48 @@
+/*
+ * ELContextMock.java Date created: 14.12.2007
+ * Last modified by: $Author$
+ * $Revision$ $Date$
+ */
+
+package org.ajax4jsf.tests;
+
+import javax.el.ELContext;
+import javax.el.ELResolver;
+import javax.el.FunctionMapper;
+import javax.el.VariableMapper;
+
+/**
+ * TODO Class description goes here.
+ * @author Andrey Markavtsov
+ *
+ */
+public class MockELContext extends ELContext {
+
+ /* (non-Javadoc)
+ * @see javax.el.ELContext#getELResolver()
+ */
+ @Override
+ public ELResolver getELResolver() {
+ // TODO Auto-generated method stub
+ return null;
+ }
+
+ /* (non-Javadoc)
+ * @see javax.el.ELContext#getFunctionMapper()
+ */
+ @Override
+ public FunctionMapper getFunctionMapper() {
+ // TODO Auto-generated method stub
+ return null;
+ }
+
+ /* (non-Javadoc)
+ * @see javax.el.ELContext#getVariableMapper()
+ */
+ @Override
+ public VariableMapper getVariableMapper() {
+ // TODO Auto-generated method stub
+ return null;
+ }
+
+}
Added: trunk/framework/test/src/main/java/org/ajax4jsf/tests/MockPageContext.java
===================================================================
--- trunk/framework/test/src/main/java/org/ajax4jsf/tests/MockPageContext.java (rev 0)
+++ trunk/framework/test/src/main/java/org/ajax4jsf/tests/MockPageContext.java 2007-12-22 11:56:40 UTC (rev 4971)
@@ -0,0 +1,297 @@
+/*
+ * PageContextMock.java Date created: 14.12.2007
+ * Last modified by: $Author$
+ * $Revision$ $Date$
+ */
+
+package org.ajax4jsf.tests;
+
+import java.io.IOException;
+import java.util.Enumeration;
+
+import javax.el.ELContext;
+import javax.servlet.Servlet;
+import javax.servlet.ServletConfig;
+import javax.servlet.ServletContext;
+import javax.servlet.ServletException;
+import javax.servlet.ServletRequest;
+import javax.servlet.ServletResponse;
+import javax.servlet.http.HttpSession;
+import javax.servlet.jsp.JspWriter;
+import javax.servlet.jsp.PageContext;
+import javax.servlet.jsp.el.ExpressionEvaluator;
+import javax.servlet.jsp.el.VariableResolver;
+
+/**
+ * TODO Class description goes here.
+ * @author Andrey Markavtsov
+ *
+ */
+public class MockPageContext extends PageContext {
+
+
+ private ELContext ELContext;
+
+
+
+ /**
+ * TODO Description goes here.
+ */
+ public MockPageContext() {
+ super();
+ ELContext = new MockELContext();
+ // TODO Auto-generated constructor stub
+ }
+
+ /* (non-Javadoc)
+ * @see javax.servlet.jsp.PageContext#forward(java.lang.String)
+ */
+ @Override
+ public void forward(String relativeUrlPath) throws ServletException,
+ IOException {
+ // TODO Auto-generated method stub
+
+ }
+
+ /* (non-Javadoc)
+ * @see javax.servlet.jsp.PageContext#getException()
+ */
+ @Override
+ public Exception getException() {
+ // TODO Auto-generated method stub
+ return null;
+ }
+
+ /* (non-Javadoc)
+ * @see javax.servlet.jsp.PageContext#getPage()
+ */
+ @Override
+ public Object getPage() {
+ // TODO Auto-generated method stub
+ return null;
+ }
+
+ /* (non-Javadoc)
+ * @see javax.servlet.jsp.PageContext#getRequest()
+ */
+ @Override
+ public ServletRequest getRequest() {
+ // TODO Auto-generated method stub
+ return null;
+ }
+
+ /* (non-Javadoc)
+ * @see javax.servlet.jsp.PageContext#getResponse()
+ */
+ @Override
+ public ServletResponse getResponse() {
+ // TODO Auto-generated method stub
+ return null;
+ }
+
+ /* (non-Javadoc)
+ * @see javax.servlet.jsp.PageContext#getServletConfig()
+ */
+ @Override
+ public ServletConfig getServletConfig() {
+ // TODO Auto-generated method stub
+ return null;
+ }
+
+ /* (non-Javadoc)
+ * @see javax.servlet.jsp.PageContext#getServletContext()
+ */
+ @Override
+ public ServletContext getServletContext() {
+ // TODO Auto-generated method stub
+ return null;
+ }
+
+ /* (non-Javadoc)
+ * @see javax.servlet.jsp.PageContext#getSession()
+ */
+ @Override
+ public HttpSession getSession() {
+ // TODO Auto-generated method stub
+ return null;
+ }
+
+ /* (non-Javadoc)
+ * @see javax.servlet.jsp.PageContext#handlePageException(java.lang.Exception)
+ */
+ @Override
+ public void handlePageException(Exception e) throws ServletException,
+ IOException {
+ // TODO Auto-generated method stub
+
+ }
+
+ /* (non-Javadoc)
+ * @see javax.servlet.jsp.PageContext#handlePageException(java.lang.Throwable)
+ */
+ @Override
+ public void handlePageException(Throwable t) throws ServletException,
+ IOException {
+ // TODO Auto-generated method stub
+
+ }
+
+ /* (non-Javadoc)
+ * @see javax.servlet.jsp.PageContext#include(java.lang.String)
+ */
+ @Override
+ public void include(String relativeUrlPath) throws ServletException,
+ IOException {
+ // TODO Auto-generated method stub
+
+ }
+
+ /* (non-Javadoc)
+ * @see javax.servlet.jsp.PageContext#include(java.lang.String, boolean)
+ */
+ @Override
+ public void include(String relativeUrlPath, boolean flush)
+ throws ServletException, IOException {
+ // TODO Auto-generated method stub
+
+ }
+
+ /* (non-Javadoc)
+ * @see javax.servlet.jsp.PageContext#initialize(javax.servlet.Servlet, javax.servlet.ServletRequest, javax.servlet.ServletResponse, java.lang.String, boolean, int, boolean)
+ */
+ @Override
+ public void initialize(Servlet servlet, ServletRequest request,
+ ServletResponse response, String errorPageURL,
+ boolean needsSession, int bufferSize, boolean autoFlush)
+ throws IOException, IllegalStateException, IllegalArgumentException {
+ // TODO Auto-generated method stub
+
+ }
+
+ /* (non-Javadoc)
+ * @see javax.servlet.jsp.PageContext#release()
+ */
+ @Override
+ public void release() {
+ // TODO Auto-generated method stub
+
+ }
+
+ /* (non-Javadoc)
+ * @see javax.servlet.jsp.JspContext#findAttribute(java.lang.String)
+ */
+ @Override
+ public Object findAttribute(String name) {
+ // TODO Auto-generated method stub
+ return null;
+ }
+
+ /* (non-Javadoc)
+ * @see javax.servlet.jsp.JspContext#getAttribute(java.lang.String)
+ */
+ @Override
+ public Object getAttribute(String name) {
+ // TODO Auto-generated method stub
+ return null;
+ }
+
+ /* (non-Javadoc)
+ * @see javax.servlet.jsp.JspContext#getAttribute(java.lang.String, int)
+ */
+ @Override
+ public Object getAttribute(String name, int scope) {
+ // TODO Auto-generated method stub
+ return null;
+ }
+
+ /* (non-Javadoc)
+ * @see javax.servlet.jsp.JspContext#getAttributeNamesInScope(int)
+ */
+ @Override
+ public Enumeration<String> getAttributeNamesInScope(int scope) {
+ // TODO Auto-generated method stub
+ return null;
+ }
+
+ /* (non-Javadoc)
+ * @see javax.servlet.jsp.JspContext#getAttributesScope(java.lang.String)
+ */
+ @Override
+ public int getAttributesScope(String name) {
+ // TODO Auto-generated method stub
+ return 0;
+ }
+
+ /* (non-Javadoc)
+ * @see javax.servlet.jsp.JspContext#getELContext()
+ */
+ @Override
+ public ELContext getELContext() {
+ // TODO Auto-generated method stub
+ return this.ELContext;
+ }
+
+ /* (non-Javadoc)
+ * @see javax.servlet.jsp.JspContext#getExpressionEvaluator()
+ */
+ @Override
+ public ExpressionEvaluator getExpressionEvaluator() {
+ // TODO Auto-generated method stub
+ return null;
+ }
+
+ /* (non-Javadoc)
+ * @see javax.servlet.jsp.JspContext#getOut()
+ */
+ @Override
+ public JspWriter getOut() {
+ // TODO Auto-generated method stub
+ return null;
+ }
+
+ /* (non-Javadoc)
+ * @see javax.servlet.jsp.JspContext#getVariableResolver()
+ */
+ @Override
+ public VariableResolver getVariableResolver() {
+ // TODO Auto-generated method stub
+ return null;
+ }
+
+ /* (non-Javadoc)
+ * @see javax.servlet.jsp.JspContext#removeAttribute(java.lang.String)
+ */
+ @Override
+ public void removeAttribute(String name) {
+ // TODO Auto-generated method stub
+
+ }
+
+ /* (non-Javadoc)
+ * @see javax.servlet.jsp.JspContext#removeAttribute(java.lang.String, int)
+ */
+ @Override
+ public void removeAttribute(String name, int scope) {
+ // TODO Auto-generated method stub
+
+ }
+
+ /* (non-Javadoc)
+ * @see javax.servlet.jsp.JspContext#setAttribute(java.lang.String, java.lang.Object)
+ */
+ @Override
+ public void setAttribute(String name, Object value) {
+ // TODO Auto-generated method stub
+
+ }
+
+ /* (non-Javadoc)
+ * @see javax.servlet.jsp.JspContext#setAttribute(java.lang.String, java.lang.Object, int)
+ */
+ @Override
+ public void setAttribute(String name, Object value, int scope) {
+ // TODO Auto-generated method stub
+
+ }
+
+}
Added: trunk/framework/test/src/main/java/org/ajax4jsf/tests/MockValueExpression.java
===================================================================
--- trunk/framework/test/src/main/java/org/ajax4jsf/tests/MockValueExpression.java (rev 0)
+++ trunk/framework/test/src/main/java/org/ajax4jsf/tests/MockValueExpression.java 2007-12-22 11:56:40 UTC (rev 4971)
@@ -0,0 +1,110 @@
+/*
+ * ValueExpressionMock.java Date created: 14.12.2007
+ * Last modified by: $Author$
+ * $Revision$ $Date$
+ */
+
+package org.ajax4jsf.tests;
+
+import javax.el.ELContext;
+import javax.el.ValueExpression;
+
+/**
+ * TODO Class description goes here.
+ * @author Andrey Markavtsov
+ *
+ */
+public class MockValueExpression extends ValueExpression {
+
+ /** Object to returned by getValue method */
+ private Object o;
+
+ /**
+ * TODO Description goes here.
+ */
+ public MockValueExpression(Object o) {
+ this.o = o;
+ }
+
+ /* (non-Javadoc)
+ * @see javax.el.ValueExpression#getExpectedType()
+ */
+ @Override
+ public Class<?> getExpectedType() {
+ // TODO Auto-generated method stub
+ return Object.class;
+ }
+
+ /* (non-Javadoc)
+ * @see javax.el.ValueExpression#getType(javax.el.ELContext)
+ */
+ @Override
+ public Class<?> getType(ELContext context) {
+ // TODO Auto-generated method stub
+ return Object.class;
+ }
+
+ /* (non-Javadoc)
+ * @see javax.el.ValueExpression#getValue(javax.el.ELContext)
+ */
+ @Override
+ public Object getValue(ELContext context) {
+ // TODO Auto-generated method stub
+ return o;
+ }
+
+ /* (non-Javadoc)
+ * @see javax.el.ValueExpression#isReadOnly(javax.el.ELContext)
+ */
+ @Override
+ public boolean isReadOnly(ELContext context) {
+ // TODO Auto-generated method stub
+ return false;
+ }
+
+ /* (non-Javadoc)
+ * @see javax.el.ValueExpression#setValue(javax.el.ELContext, java.lang.Object)
+ */
+ @Override
+ public void setValue(ELContext context, Object value) {
+ // TODO Auto-generated method stub
+
+ }
+
+ /* (non-Javadoc)
+ * @see javax.el.Expression#equals(java.lang.Object)
+ */
+ @Override
+ public boolean equals(Object obj) {
+ // TODO Auto-generated method stub
+ return false;
+ }
+
+ /* (non-Javadoc)
+ * @see javax.el.Expression#getExpressionString()
+ */
+ @Override
+ public String getExpressionString() {
+ // TODO Auto-generated method stub
+ return null;
+ }
+
+ /* (non-Javadoc)
+ * @see javax.el.Expression#hashCode()
+ */
+ @Override
+ public int hashCode() {
+ // TODO Auto-generated method stub
+ return 0;
+ }
+
+ /* (non-Javadoc)
+ * @see javax.el.Expression#isLiteralText()
+ */
+ @Override
+ public boolean isLiteralText() {
+ // TODO Auto-generated method stub
+ return true;
+ }
+
+}
16 years, 9 months
JBoss Rich Faces SVN: r4970 - in trunk/ui/columns: src/test/java/org/richfaces/facelet and 3 other directories.
by richfaces-svn-commits＠lists.jboss.org
Author: andrei_exadel
Date: 2007-12-22 06:53:24 -0500 (Sat, 22 Dec 2007)
New Revision: 4970
Added:
trunk/ui/columns/src/test/java/org/richfaces/jsp/tag/DataTableTagMock.java
Removed:
trunk/ui/columns/src/test/java/org/richfaces/facelet/FaceletTagTestCase.java
trunk/ui/columns/src/test/java/org/richfaces/facelet/mock/
trunk/ui/columns/src/test/java/org/richfaces/jsp/mock/
Modified:
trunk/ui/columns/pom.xml
trunk/ui/columns/src/test/java/org/richfaces/facelet/tag/ColumnsFaceletTagTest.java
trunk/ui/columns/src/test/java/org/richfaces/jsp/tag/ColumnsJspTagTest.java
Log:
Move jsp mockups to rich-test project
Modified: trunk/ui/columns/pom.xml
===================================================================
--- trunk/ui/columns/pom.xml 2007-12-22 11:06:38 UTC (rev 4969)
+++ trunk/ui/columns/pom.xml 2007-12-22 11:53:24 UTC (rev 4970)
@@ -49,12 +49,12 @@
<groupId>org.richfaces.ui</groupId>
<artifactId>dataTable</artifactId>
<version>${project.version}</version>
- </dependency>
- <dependency>
- <groupId>el-impl</groupId>
- <artifactId>el-impl</artifactId>
- <version>1.0</version>
- <scope>test</scope>
+ </dependency>
+ <dependency>
+ <groupId>el-impl</groupId>
+ <artifactId>el-impl</artifactId>
+ <version>1.0</version>
+ <scope>test</scope>
</dependency>
</dependencies>
</project>
\ No newline at end of file
Deleted: trunk/ui/columns/src/test/java/org/richfaces/facelet/FaceletTagTestCase.java
===================================================================
--- trunk/ui/columns/src/test/java/org/richfaces/facelet/FaceletTagTestCase.java 2007-12-22 11:06:38 UTC (rev 4969)
+++ trunk/ui/columns/src/test/java/org/richfaces/facelet/FaceletTagTestCase.java 2007-12-22 11:53:24 UTC (rev 4970)
@@ -1,54 +0,0 @@
-/**
- * Copyright 2005 Sun Microsystems, Inc. All rights reserved.
- * Licensed under the Common Development and Distribution License,
- * you may not use this file except in compliance with the License.
- * You may obtain a copy of the License at
- *
- * http://www.sun.com/cddl/
- *
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or
- * implied. See the License for the specific language governing
- * permissions and limitations under the License.
- */
-
-package org.richfaces.facelet;
-
-import java.io.StringWriter;
-
-import javax.faces.context.ResponseWriter;
-
-import org.ajax4jsf.tests.AbstractAjax4JsfTestCase;
-
-import com.sun.facelets.FaceletFactory;
-import com.sun.facelets.compiler.Compiler;
-import com.sun.facelets.compiler.SAXCompiler;
-import com.sun.facelets.impl.DefaultFaceletFactory;
-import com.sun.facelets.impl.ResourceResolver;
-
-public abstract class FaceletTagTestCase extends AbstractAjax4JsfTestCase implements ResourceResolver {
-
- public FaceletTagTestCase(String name) {
- super(name);
- }
-
- public void setUp() throws Exception {
- super.setUp();
- Compiler c = new SAXCompiler();
- //c.setTrimmingWhitespace(true);
- FaceletFactory factory = new DefaultFaceletFactory(c, this);
- FaceletFactory.setInstance(factory);
-
- facesContext.setViewRoot(facesContext.getApplication().getViewHandler().createView(facesContext, "/test"));
-
- ResponseWriter rw = facesContext.getRenderKit().createResponseWriter(new StringWriter(), null, null);
- facesContext.setResponseWriter(rw);
- }
-
- public void tearDown() throws Exception {
- super.tearDown();
- this.servletContext = null;
- }
-
-}
Modified: trunk/ui/columns/src/test/java/org/richfaces/facelet/tag/ColumnsFaceletTagTest.java
===================================================================
--- trunk/ui/columns/src/test/java/org/richfaces/facelet/tag/ColumnsFaceletTagTest.java 2007-12-22 11:06:38 UTC (rev 4969)
+++ trunk/ui/columns/src/test/java/org/richfaces/facelet/tag/ColumnsFaceletTagTest.java 2007-12-22 11:53:24 UTC (rev 4970)
@@ -5,6 +5,7 @@
*/
package org.richfaces.facelet.tag;
+import java.io.StringWriter;
import java.net.URL;
import java.util.ArrayList;
import java.util.Collection;
@@ -13,13 +14,18 @@
import javax.faces.component.UIComponent;
import javax.faces.component.UIOutput;
import javax.faces.component.UIViewRoot;
+import javax.faces.context.ResponseWriter;
+import org.ajax4jsf.tests.AbstractAjax4JsfTestCase;
import org.richfaces.component.UIColumn;
import org.richfaces.component.html.HtmlColumn;
-import org.richfaces.facelet.FaceletTagTestCase;
import com.sun.facelets.Facelet;
import com.sun.facelets.FaceletFactory;
+import com.sun.facelets.compiler.Compiler;
+import com.sun.facelets.compiler.SAXCompiler;
+import com.sun.facelets.impl.DefaultFaceletFactory;
+import com.sun.facelets.impl.ResourceResolver;
/**
* Unit test for simple Component.
@@ -29,13 +35,32 @@
* @author Andrey Markavtsov
*
*/
-public class ColumnsFaceletTagTest extends FaceletTagTestCase {
+public class ColumnsFaceletTagTest extends AbstractAjax4JsfTestCase implements ResourceResolver {
public ColumnsFaceletTagTest(String name) {
super(name);
}
+
+ public void setUp() throws Exception {
+ super.setUp();
+ Compiler c = new SAXCompiler();
+ //c.setTrimmingWhitespace(true);
+ FaceletFactory factory = new DefaultFaceletFactory(c, this);
+ FaceletFactory.setInstance(factory);
+ facesContext.setViewRoot(facesContext.getApplication().getViewHandler().createView(facesContext, "/test"));
+ ResponseWriter rw = facesContext.getRenderKit().createResponseWriter(new StringWriter(), null, null);
+ facesContext.setResponseWriter(rw);
+ }
+
+ public void tearDown() throws Exception {
+ super.tearDown();
+ this.servletContext = null;
+ }
+
+
+
public void testFacelet() throws Exception {
Map session = facesContext.getExternalContext().getSessionMap();
Collection c = new ArrayList();
@@ -72,14 +97,9 @@
assertNotNull(facet);
assertTrue(facet instanceof UIOutput);
UIOutput output = (UIOutput)facet;
- Integer val = (Integer) output.getValue();
- assertTrue(val.equals(4));
-
+
assertTrue(component.getChildCount() == 1 );
-
- output = (UIOutput)component.getChildren().get(0);
- String value = (String) output.getValue();
- assertTrue("1".equals(value));
+
}
Modified: trunk/ui/columns/src/test/java/org/richfaces/jsp/tag/ColumnsJspTagTest.java
===================================================================
--- trunk/ui/columns/src/test/java/org/richfaces/jsp/tag/ColumnsJspTagTest.java 2007-12-22 11:06:38 UTC (rev 4969)
+++ trunk/ui/columns/src/test/java/org/richfaces/jsp/tag/ColumnsJspTagTest.java 2007-12-22 11:53:24 UTC (rev 4970)
@@ -14,12 +14,11 @@
import javax.faces.component.UIComponent;
import javax.faces.webapp.UIComponentClassicTagBase;
+import org.ajax4jsf.tests.MockPageContext;
+import org.ajax4jsf.tests.MockValueExpression;
import org.apache.shale.test.base.AbstractJsfTestCase;
import org.richfaces.component.UIColumn;
import org.richfaces.component.html.HtmlDataTable;
-import org.richfaces.jsp.mock.DataTableTagMock;
-import org.richfaces.jsp.mock.PageContextMock;
-import org.richfaces.jsp.mock.ValueExpressionMock;
import org.richfaces.taglib.ColumnsTag;
/**
@@ -59,7 +58,7 @@
* @return - created value expression
*/
private ValueExpression getValueExpression(Object o, ELContext el) {
- ValueExpression exp = new ValueExpressionMock(o);
+ ValueExpression exp = new MockValueExpression(o);
return exp;
}
@@ -127,7 +126,7 @@
expr = getValueExpression("counter", el);
tag.setIndex(expr);
- PageContextMock pageContext = new PageContextMock();
+ MockPageContext pageContext = new MockPageContext();
tag.setPageContext(pageContext);
}
Added: trunk/ui/columns/src/test/java/org/richfaces/jsp/tag/DataTableTagMock.java
===================================================================
--- trunk/ui/columns/src/test/java/org/richfaces/jsp/tag/DataTableTagMock.java (rev 0)
+++ trunk/ui/columns/src/test/java/org/richfaces/jsp/tag/DataTableTagMock.java 2007-12-22 11:53:24 UTC (rev 4970)
@@ -0,0 +1,42 @@
+/*
+ * DataTableTagMock.java Date created: 14.12.2007
+ * Last modified by: $Author$
+ * $Revision$ $Date$
+ */
+
+package org.richfaces.jsp.tag;
+
+import javax.faces.component.UIComponent;
+
+import org.richfaces.taglib.DataTableTag;
+
+/**
+ * TODO Class description goes here.
+ * @author Andrey Markavtsov
+ *
+ */
+public class DataTableTagMock extends DataTableTag {
+
+ /** Component to be returned by getComponentInstatnce method */
+ private UIComponent component;
+
+ /**
+ * TODO Description goes here.
+ * @param component
+ */
+ public DataTableTagMock(UIComponent component) {
+ super();
+ this.component = component;
+ }
+
+ /* (non-Javadoc)
+ * @see javax.faces.webapp.UIComponentClassicTagBase#getComponentInstance()
+ */
+ @Override
+ public UIComponent getComponentInstance() {
+ return component;
+ }
+
+
+
+}
16 years, 9 months
JBoss Rich Faces SVN: r4969 - management/design/comboBox.
by richfaces-svn-commits＠lists.jboss.org
Author: ilya_shaikovsky
Date: 2007-12-22 06:06:38 -0500 (Sat, 22 Dec 2007)
New Revision: 4969
Modified:
management/design/comboBox/comboBox.doc
Log:
Modified: management/design/comboBox/comboBox.doc
===================================================================
(Binary files differ)
16 years, 9 months
JBoss Rich Faces SVN: r4968 - management/design/comboBox.
by richfaces-svn-commits＠lists.jboss.org
Author: ilya_shaikovsky
Date: 2007-12-22 05:47:10 -0500 (Sat, 22 Dec 2007)
New Revision: 4968
Modified:
management/design/comboBox/comboBox.doc
Log:
Modified: management/design/comboBox/comboBox.doc
===================================================================
(Binary files differ)
16 years, 9 months
JBoss Rich Faces SVN: r4967 - in trunk/samples/treeModelDemo/src/main: java/org/richfaces/model and 1 other directories.
by richfaces-svn-commits＠lists.jboss.org
Author: nbelaevski
Date: 2007-12-21 22:29:43 -0500 (Fri, 21 Dec 2007)
New Revision: 4967
Added:
trunk/samples/treeModelDemo/src/main/java/org/richfaces/model/SimpleRecursiveNode.java
Modified:
trunk/samples/treeModelDemo/src/main/java/org/richfaces/TreeModelBean.java
trunk/samples/treeModelDemo/src/main/webapp/pages/index.jsp
Log:
http://jira.jboss.com/jira/browse/RF-980
Modified: trunk/samples/treeModelDemo/src/main/java/org/richfaces/TreeModelBean.java
===================================================================
--- trunk/samples/treeModelDemo/src/main/java/org/richfaces/TreeModelBean.java 2007-12-22 03:10:52 UTC (rev 4966)
+++ trunk/samples/treeModelDemo/src/main/java/org/richfaces/TreeModelBean.java 2007-12-22 03:29:43 UTC (rev 4967)
@@ -3,7 +3,10 @@
*/
package org.richfaces;
+import java.util.List;
+
import org.richfaces.component.UITree;
+import org.richfaces.model.SimpleRecursiveNode;
/**
* @author Nick Belaevski
@@ -15,4 +18,25 @@
public Boolean adviseNodeOpened(UITree tree) {
return Boolean.TRUE;
}
+
+ private SimpleRecursiveNode simpleRecursiveNode;
+
+ public TreeModelBean() {
+ simpleRecursiveNode = new SimpleRecursiveNode(null, null);
+ for (int i = 0; i < 5; i++) {
+ SimpleRecursiveNode node2 = new SimpleRecursiveNode(simpleRecursiveNode, "Node " + i);
+
+ for (int j = 0; j < 6; j++) {
+ SimpleRecursiveNode node3 = new SimpleRecursiveNode(node2, "Node " + i + " " + j);
+
+ for (int k = 0; k < 4; k++) {
+ SimpleRecursiveNode node4 = new SimpleRecursiveNode(node3, "Node " + i + " " + j + " " + k);
+ }
+ }
+ }
+ }
+
+ public List getSimpleResursiveNodes() {
+ return simpleRecursiveNode.getChildren();
+ }
}
Added: trunk/samples/treeModelDemo/src/main/java/org/richfaces/model/SimpleRecursiveNode.java
===================================================================
--- trunk/samples/treeModelDemo/src/main/java/org/richfaces/model/SimpleRecursiveNode.java (rev 0)
+++ trunk/samples/treeModelDemo/src/main/java/org/richfaces/model/SimpleRecursiveNode.java 2007-12-22 03:29:43 UTC (rev 4967)
@@ -0,0 +1,79 @@
+/**
+ * License Agreement.
+ *
+ * JBoss RichFaces - Ajax4jsf Component Library
+ *
+ * Copyright (C) 2007 Exadel, Inc.
+ *
+ * This library is free software; you can redistribute it and/or
+ * modify it under the terms of the GNU Lesser General Public
+ * License version 2.1 as published by the Free Software Foundation.
+ *
+ * This library is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
+ * Lesser General Public License for more details.
+ *
+ * You should have received a copy of the GNU Lesser General Public
+ * License along with this library; if not, write to the Free Software
+ * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA
+ */
+
+package org.richfaces.model;
+
+import java.util.ArrayList;
+import java.util.List;
+
+/**
+ *
+ * <br /><br />
+ *
+ * Created 22.12.2007
+ * @author Nick Belaevski
+ * @since 3.2
+ */
+
+public class SimpleRecursiveNode {
+
+ private SimpleRecursiveNode parent;
+
+ private List children = new ArrayList();
+
+ private String text;
+
+ public SimpleRecursiveNode(SimpleRecursiveNode parent,
+ String text) {
+ super();
+ this.parent = parent;
+ if (parent != null) {
+ parent.addChild(this);
+ }
+ this.text = text;
+ }
+
+ public void addChild(SimpleRecursiveNode node) {
+ children.add(node);
+ }
+
+ public void removeChild(SimpleRecursiveNode node) {
+ children.remove(node);
+ }
+
+ public void remove() {
+ if (parent != null) {
+ parent.removeChild(this);
+ }
+ }
+
+ public SimpleRecursiveNode getParent() {
+ return parent;
+ }
+
+ public List getChildren() {
+ return children;
+ }
+
+ public String getText() {
+ return text;
+ }
+}
Modified: trunk/samples/treeModelDemo/src/main/webapp/pages/index.jsp
===================================================================
--- trunk/samples/treeModelDemo/src/main/webapp/pages/index.jsp 2007-12-22 03:10:52 UTC (rev 4966)
+++ trunk/samples/treeModelDemo/src/main/webapp/pages/index.jsp 2007-12-22 03:29:43 UTC (rev 4967)
@@ -85,6 +85,14 @@
</model:treeNodes--%>
</model:treeNodesAdaptor>
</tree:tree>
+
+ <tree:tree adviseNodeOpened="#{treeModelBean.adviseNodeOpened}" switchType="client">
+ <model:recursiveTreeNodesAdaptor roots="#{treeModelBean.simpleResursiveNodes}" var="node" nodes="#{node.children}">
+ <tree:treeNode>
+ <h:commandLink value="#{node.text}" action="#{node.remove}" />
+ </tree:treeNode>
+ </model:recursiveTreeNodesAdaptor>
+ </tree:tree>
</h:form>
</f:view>
</body>
16 years, 9 months
JBoss Rich Faces SVN: r4966 - trunk/ui/tree/src/main/java/org/richfaces/renderkit.
by richfaces-svn-commits＠lists.jboss.org
Author: nbelaevski
Date: 2007-12-21 22:10:52 -0500 (Fri, 21 Dec 2007)
New Revision: 4966
Modified:
trunk/ui/tree/src/main/java/org/richfaces/renderkit/NodeRendererBase.java
trunk/ui/tree/src/main/java/org/richfaces/renderkit/TreeRendererBase.java
Log:
http://jira.jboss.com/jira/browse/RF-980
Modified: trunk/ui/tree/src/main/java/org/richfaces/renderkit/NodeRendererBase.java
===================================================================
--- trunk/ui/tree/src/main/java/org/richfaces/renderkit/NodeRendererBase.java 2007-12-22 00:32:17 UTC (rev 4965)
+++ trunk/ui/tree/src/main/java/org/richfaces/renderkit/NodeRendererBase.java 2007-12-22 03:10:52 UTC (rev 4966)
@@ -66,10 +66,11 @@
String id = treeNode.getClientId(context);
if (UITree.SWITCH_AJAX.equals(tree.getSwitchType())) {
- JSFunction function = AjaxRendererUtils.buildAjaxFunction(tree.getNodeFacet(),
+ UITreeNode nodeFacet = tree.getNodeFacet();
+ JSFunction function = AjaxRendererUtils.buildAjaxFunction(nodeFacet,
context);
Map eventOptions = AjaxRendererUtils.buildEventOptions(context,
- tree.getNodeFacet());
+ nodeFacet);
Map parameters = (Map) eventOptions.get("parameters");
parameters.remove(id);
Modified: trunk/ui/tree/src/main/java/org/richfaces/renderkit/TreeRendererBase.java
===================================================================
--- trunk/ui/tree/src/main/java/org/richfaces/renderkit/TreeRendererBase.java 2007-12-22 00:32:17 UTC (rev 4965)
+++ trunk/ui/tree/src/main/java/org/richfaces/renderkit/TreeRendererBase.java 2007-12-22 03:10:52 UTC (rev 4966)
@@ -492,7 +492,9 @@
Object rowKey = tree.getRowKey();
try {
tree.setRowKey(selectedNodeKey);
- result = tree.getNodeFacet().getClientId(context);
+ if (tree.isRowAvailable()) {
+ result = tree.getNodeFacet().getClientId(context);
+ }
} finally {
try {
tree.setRowKey(rowKey);
16 years, 9 months