JBoss Rich Faces SVN: r12468 - trunk/ui/simpleTogglePanel/src/test/java/org/richfaces/component.
by richfaces-svn-commits＠lists.jboss.org
Author: nbelaevski
Date: 2009-01-28 10:18:36 -0500 (Wed, 28 Jan 2009)
New Revision: 12468
Modified:
trunk/ui/simpleTogglePanel/src/test/java/org/richfaces/component/SimpleTogglePanelComponentTest.java
Log:
https://jira.jboss.org/jira/browse/RF-3552
Modified: trunk/ui/simpleTogglePanel/src/test/java/org/richfaces/component/SimpleTogglePanelComponentTest.java
===================================================================
--- trunk/ui/simpleTogglePanel/src/test/java/org/richfaces/component/SimpleTogglePanelComponentTest.java 2009-01-28 14:26:14 UTC (rev 12467)
+++ trunk/ui/simpleTogglePanel/src/test/java/org/richfaces/component/SimpleTogglePanelComponentTest.java 2009-01-28 15:18:36 UTC (rev 12468)
@@ -21,25 +21,24 @@
package org.richfaces.component;
-import com.gargoylesoftware.htmlunit.html.HtmlDivision;
-import com.gargoylesoftware.htmlunit.html.HtmlElement;
-import com.gargoylesoftware.htmlunit.html.HtmlPage;
-import com.gargoylesoftware.htmlunit.html.HtmlScript;
-import org.ajax4jsf.tests.AbstractAjax4JsfTestCase;
-import org.ajax4jsf.tests.HtmlTestUtils;
-import org.apache.commons.lang.StringUtils;
+import java.util.HashSet;
+import java.util.List;
+import java.util.Set;
import javax.faces.component.UICommand;
import javax.faces.component.UIForm;
import javax.faces.component.UIInput;
import javax.faces.component.UIOutput;
+import javax.faces.component.UIViewRoot;
import javax.faces.component.html.HtmlCommandLink;
import javax.faces.component.html.HtmlForm;
-import java.util.HashSet;
-import java.util.Iterator;
-import java.util.List;
-import java.util.Set;
+import org.ajax4jsf.tests.AbstractAjax4JsfTestCase;
+
+import com.gargoylesoftware.htmlunit.html.HtmlDivision;
+import com.gargoylesoftware.htmlunit.html.HtmlElement;
+import com.gargoylesoftware.htmlunit.html.HtmlPage;
+
/**
* Unit test for SimpleTogglePanel component.
*/
@@ -243,11 +242,13 @@
HtmlPage page = renderView();
//System.out.println(page.asXml());
+ externalContext.addRequestParameterMap(form.getClientId(facesContext), form.getClientId(facesContext));
externalContext.addRequestParameterMap(stp1.getClientId(facesContext), "false");
stp1.setSwitchType(UISimpleTogglePanel.CLIENT_SWITCH_TYPE);
- stp1.processDecodes(facesContext);
- stp1.processValidators(facesContext);
- stp1.processUpdates(facesContext);
+ UIViewRoot viewRoot = facesContext.getViewRoot();
+ viewRoot.processDecodes(facesContext);
+ viewRoot.processValidators(facesContext);
+ viewRoot.processUpdates(facesContext);
assertFalse(stp1.isOpened());
}
16 years, 1 month
JBoss Rich Faces SVN: r12467 - in trunk/samples/simpleTogglePanel-sample/src/main: webapp/WEB-INF and 1 other directories.
by richfaces-svn-commits＠lists.jboss.org
Author: nbelaevski
Date: 2009-01-28 09:26:14 -0500 (Wed, 28 Jan 2009)
New Revision: 12467
Added:
trunk/samples/simpleTogglePanel-sample/src/main/webapp/pages/index.xhtml
Modified:
trunk/samples/simpleTogglePanel-sample/src/main/java/org/richfaces/Bean.java
trunk/samples/simpleTogglePanel-sample/src/main/webapp/WEB-INF/faces-config.xml
trunk/samples/simpleTogglePanel-sample/src/main/webapp/WEB-INF/web.xml
trunk/samples/simpleTogglePanel-sample/src/main/webapp/pages/index.jsp
Log:
https://jira.jboss.org/jira/browse/RF-3552
Modified: trunk/samples/simpleTogglePanel-sample/src/main/java/org/richfaces/Bean.java
===================================================================
--- trunk/samples/simpleTogglePanel-sample/src/main/java/org/richfaces/Bean.java 2009-01-28 14:25:42 UTC (rev 12466)
+++ trunk/samples/simpleTogglePanel-sample/src/main/java/org/richfaces/Bean.java 2009-01-28 14:26:14 UTC (rev 12467)
@@ -21,6 +21,11 @@
package org.richfaces;
+import java.util.HashMap;
+import java.util.Map;
+
+import javax.faces.context.FacesContext;
+
/**
* @author $Autor$
*/
@@ -34,7 +39,14 @@
private String height = "150px";
private String style = "width: 50%; border: 2px solid gold;";
+ private String[] items = new String[] {"Item 1", "Item 2", "Item 3"};
+ private Map<String, Object> openedData = new HashMap<String, Object>();
+
+ private Map<String, Object> clientOpenedData = new HashMap<String, Object>();
+
+ private Object opened;
+
public String getStyle() {
return style;
}
@@ -91,5 +103,30 @@
this.olympus = olympus;
}
-
+ public Object getOpened() {
+ return opened;
+ }
+
+ public void setOpened(Object opened) {
+ this.opened = opened;
+ System.out.println("Bean.setOpened() " + opened);
+ }
+
+ public String[] getItems() {
+ return items;
+ }
+
+ public Map<String, Object> getOpenedData() {
+ return openedData;
+ }
+
+ public Map<String, Object> getClientOpenedData() {
+ return clientOpenedData;
+ }
+
+ public void action() {
+ FacesContext context = FacesContext.getCurrentInstance();
+ Object currentItem = context.getApplication().evaluateExpressionGet(context, "#{item}", Object.class);
+ System.out.println("Bean.action() " + currentItem);
+ }
}
\ No newline at end of file
Modified: trunk/samples/simpleTogglePanel-sample/src/main/webapp/WEB-INF/faces-config.xml
===================================================================
--- trunk/samples/simpleTogglePanel-sample/src/main/webapp/WEB-INF/faces-config.xml 2009-01-28 14:25:42 UTC (rev 12466)
+++ trunk/samples/simpleTogglePanel-sample/src/main/webapp/WEB-INF/faces-config.xml 2009-01-28 14:26:14 UTC (rev 12467)
@@ -18,6 +18,10 @@
<managed-bean-scope>session</managed-bean-scope>
</managed-bean>
+ <application>
+ <view-handler>com.sun.facelets.FaceletViewHandler</view-handler>
+ </application>
+
<navigation-rule>
<from-view-id>/pages/pageRF_2195.jsf</from-view-id>
<navigation-case>
Modified: trunk/samples/simpleTogglePanel-sample/src/main/webapp/WEB-INF/web.xml
===================================================================
--- trunk/samples/simpleTogglePanel-sample/src/main/webapp/WEB-INF/web.xml 2009-01-28 14:25:42 UTC (rev 12466)
+++ trunk/samples/simpleTogglePanel-sample/src/main/webapp/WEB-INF/web.xml 2009-01-28 14:26:14 UTC (rev 12467)
@@ -20,6 +20,11 @@
<param-value>false</param-value>
</context-param>
+ <context-param>
+ <param-name>facelets.VIEW_MAPPINGS</param-name>
+ <param-value>*.xhtml</param-value>
+ </context-param>
+
<filter>
<display-name>Ajax4jsf Filter</display-name>
<filter-name>ajax4jsf</filter-name>
Modified: trunk/samples/simpleTogglePanel-sample/src/main/webapp/pages/index.jsp
===================================================================
--- trunk/samples/simpleTogglePanel-sample/src/main/webapp/pages/index.jsp 2009-01-28 14:25:42 UTC (rev 12466)
+++ trunk/samples/simpleTogglePanel-sample/src/main/webapp/pages/index.jsp 2009-01-28 14:26:14 UTC (rev 12467)
@@ -1,5 +1,6 @@
<%@ taglib uri="http://java.sun.com/jsf/html" prefix="h" %>
<%@ taglib uri="http://java.sun.com/jsf/core" prefix="f" %>
+<%@ taglib uri="http://richfaces.org/a4j" prefix="a4j" %>
<%@ taglib uri="http://labs.jboss.com/jbossrichfaces/ui/simpleTogglePanel" prefix="stp" %>
<html>
<head>
@@ -167,6 +168,55 @@
<h:outputText value="Just text!" />
</stp:simpleTogglePanel>
+ <h:form>
+ <a4j:repeat value="#{bean.items}" var="item" rowKeyVar="rowKey">
+ <stp:simpleTogglePanel opened="#{bean.openedData[rowKey]}" switchType="ajax" label="Ajax - #{item}">
+ <a4j:commandButton action="#{bean.action}" value="action" />
+ </stp:simpleTogglePanel>
+ </a4j:repeat>
+ </h:form>
+
+ <h:form>
+ <a4j:repeat value="#{bean.items}" var="item" rowKeyVar="rowKey">
+ <stp:simpleTogglePanel opened="#{bean.clientOpenedData[rowKey]}" switchType="client" label="Client - #{item}">
+ <a4j:commandButton action="#{bean.action}" value="action" />
+ </stp:simpleTogglePanel>
+ </a4j:repeat>
+
+ <h:commandLink value="Submit" />
+ </h:form>
+
+ <a4j:outputPanel ajaxRendered="true">
+ <h:messages />
+ </a4j:outputPanel>
+
+ <h:form>
+ <stp:simpleTogglePanel id="immediatePanel" immediate="true" switchType="ajax" label="Immediate">
+ Immediate: <h:inputText value="" required="true" label="Immediate input inside immediate panel" immediate="true" /><br />
+ <h:inputText value="" required="true" label="Non-immediate input inside immediate panel" />
+ </stp:simpleTogglePanel>
+ </h:form>
+
+ <h:form>
+ <stp:simpleTogglePanel id="nonImmediatePanel" immediate="false" switchType="ajax" label="Not immediate">
+ Immediate: <h:inputText value="" required="true" label="Immediate input" immediate="true" /><br />
+ <h:inputText value="" required="true" label="Non-immediate input" />
+ </stp:simpleTogglePanel>
+ </h:form>
+
+ <h:form>
+ <stp:simpleTogglePanel value="#{bean.opened}"
+ switchType="ajax" label="Panel">
+ Panel
+ </stp:simpleTogglePanel>
+ </h:form>
+
+ <h:form>
+ <stp:simpleTogglePanel opened="#{bean.opened}"
+ switchType="ajax" label="Panel">
+ Panel
+ </stp:simpleTogglePanel>
+ </h:form>
</f:view>
</body>
</html>
Added: trunk/samples/simpleTogglePanel-sample/src/main/webapp/pages/index.xhtml
===================================================================
--- trunk/samples/simpleTogglePanel-sample/src/main/webapp/pages/index.xhtml (rev 0)
+++ trunk/samples/simpleTogglePanel-sample/src/main/webapp/pages/index.xhtml 2009-01-28 14:26:14 UTC (rev 12467)
@@ -0,0 +1,27 @@
+<?xml version="1.0" encoding="UTF-8"?>
+
+<ui:composition xmlns="http://www.w3.org/1999/xhtml"
+ xmlns:ui="http://java.sun.com/jsf/facelets"
+ xmlns:h="http://java.sun.com/jsf/html"
+ xmlns:f="http://java.sun.com/jsf/core"
+ xmlns:a4j="http://richfaces.org/a4j"
+ xmlns:stp="http://labs.jboss.com/jbossrichfaces/ui/simpleTogglePanel">
+ <html>
+ <head></head>
+ <body>
+ <h:form>
+ <stp:simpleTogglePanel value="#{bean.opened}"
+ switchType="ajax" label="Panel">
+ Panel
+ </stp:simpleTogglePanel>
+ </h:form>
+
+ <h:form>
+ <stp:simpleTogglePanel opened="#{bean.opened}"
+ switchType="ajax" label="Panel">
+ Panel
+ </stp:simpleTogglePanel>
+ </h:form>
+ </body>
+ </html>
+</ui:composition>
16 years, 1 month
JBoss Rich Faces SVN: r12466 - in trunk/ui/simpleTogglePanel/src/main/java/org/richfaces: event and 2 other directories.
by richfaces-svn-commits＠lists.jboss.org
Author: nbelaevski
Date: 2009-01-28 09:25:42 -0500 (Wed, 28 Jan 2009)
New Revision: 12466
Added:
trunk/ui/simpleTogglePanel/src/main/java/org/richfaces/event/SimpleTogglePanelSwitchEvent.java
Modified:
trunk/ui/simpleTogglePanel/src/main/java/org/richfaces/component/UISimpleTogglePanel.java
trunk/ui/simpleTogglePanel/src/main/java/org/richfaces/renderkit/html/SimpleTogglePanelRenderer.java
trunk/ui/simpleTogglePanel/src/main/java/org/richfaces/taglib/SimpleTogglePanelTagHandlerBase.java
Log:
https://jira.jboss.org/jira/browse/RF-3552
Modified: trunk/ui/simpleTogglePanel/src/main/java/org/richfaces/component/UISimpleTogglePanel.java
===================================================================
--- trunk/ui/simpleTogglePanel/src/main/java/org/richfaces/component/UISimpleTogglePanel.java 2009-01-28 14:16:38 UTC (rev 12465)
+++ trunk/ui/simpleTogglePanel/src/main/java/org/richfaces/component/UISimpleTogglePanel.java 2009-01-28 14:25:42 UTC (rev 12466)
@@ -23,22 +23,30 @@
import java.util.Iterator;
+import javax.el.ELException;
+import javax.el.ValueExpression;
+import javax.faces.FacesException;
+import javax.faces.application.FacesMessage;
import javax.faces.component.ActionSource;
import javax.faces.component.UIComponent;
+import javax.faces.component.UIInput;
import javax.faces.context.FacesContext;
import javax.faces.event.AbortProcessingException;
import javax.faces.event.FacesEvent;
+import javax.faces.event.PhaseId;
import org.ajax4jsf.component.AjaxActionComponent;
import org.ajax4jsf.component.AjaxComponent;
+import org.ajax4jsf.component.IterationStateHolder;
import org.ajax4jsf.event.AjaxSource;
-import org.richfaces.event.SimpleToggleEvent;
+import org.richfaces.component.util.MessageUtil;
+import org.richfaces.event.SimpleTogglePanelSwitchEvent;
/**
* JSF component class
*/
-public abstract class UISimpleTogglePanel extends AjaxActionComponent implements AjaxComponent, AjaxSource, ActionSource
+public abstract class UISimpleTogglePanel extends AjaxActionComponent implements AjaxComponent, AjaxSource, ActionSource, IterationStateHolder
//public abstract class UISimpleTogglePanel extends UIInput implements AjaxComponent, AjaxSource, ActionSource
{
@@ -46,22 +54,21 @@
public static final String SERVER_SWITCH_TYPE = "server";
public static final String CLIENT_SWITCH_TYPE = "client";
public static final String AJAX_SWITCH_TYPE = "ajax";
+
+ @Deprecated
public static final boolean COLLAPSED = false;
+ @Deprecated
public static final boolean EXPANDED = true;
// private transient Boolean openedSet = null;
- private transient Boolean wasOpened = null;
+ private transient Boolean wasOpened = Boolean.FALSE;
+ protected void setWasOpened(Boolean wasOpened) {
+ this.wasOpened = wasOpened;
+ }
+
protected boolean isWasOpened() {
- if (wasOpened == null) {
- if (CLIENT_SWITCH_TYPE.equals(getSwitchType())) {
- wasOpened = Boolean.TRUE;
- } else {
- wasOpened = isOpened();
- }
- }
-
return wasOpened;
}
@@ -102,6 +109,8 @@
return;
}
+ setWasOpened(Boolean.valueOf(CLIENT_SWITCH_TYPE.equals(getSwitchType()) || isOpened()));
+
if (isWasOpened()) {
// Process all facets and children of this component
Iterator<UIComponent> kids = getFacetsAndChildren();
@@ -120,16 +129,7 @@
}
}
- @Override
- public void broadcast(FacesEvent event) throws AbortProcessingException {
- if(event instanceof SimpleToggleEvent) {
- SimpleToggleEvent simpleToggleEvent = (SimpleToggleEvent) event;
- setOpened(simpleToggleEvent.isIsOpen());
- }
- super.broadcast(event);
- }
-
/**
* @throws NullPointerException {@inheritDoc}
*/
@@ -169,8 +169,6 @@
return;
}
-// updateModel();
-
if (isWasOpened()) {
// Process all facets and children of this component
Iterator<UIComponent> kids = getFacetsAndChildren();
@@ -181,38 +179,163 @@
}
}
-// private void updateModel () {
-// if (openedSet != null) {
-// setOpened(openedSet);
-// }
-// }
-
-// public boolean isOpenedSet() {
-// return openedSet;
-// }
+ @Override
+ public void queueEvent(FacesEvent event) {
+ if (event instanceof SimpleTogglePanelSwitchEvent && this.equals(event.getComponent())) {
+ SimpleTogglePanelSwitchEvent switchEvent = (SimpleTogglePanelSwitchEvent) event;
-// /**
-// * @param openedSet the openedSet to set
-// */
-// public void setOpenedSet(boolean openedSet) {
-// this.openedSet = openedSet;
-// }
+ if (isImmediate()) {
+ setOpened(switchEvent.isOpened());
+ }
+
+ switchEvent.setPhaseId(PhaseId.UPDATE_MODEL_VALUES);
+ }
+
+ super.queueEvent(event);
+ }
-/*
- * public void setValueBinding(String arg0, ValueBinding arg1) { if
- * ("opened".equals(arg0)) super.setValueBinding("value", arg1);
- * super.setValueBinding(arg0, arg1); }
- *
- * public ValueBinding getValueBinding(String arg0) { if ("opened".equals(arg0))
- * return super.getValueBinding("value"); return super.getValueBinding(arg0); }
- */
- //public void broadcast(FacesEvent facesEvent) throws AbortProcessingException {
- // super.broadcast(facesEvent);
- // FacesContext facesContext = FacesContext.getCurrentInstance();
- // if (AjaxRendererUtils.isAjaxRequest(facesContext) && this.getSwitchType().equals(AJAX_SWITCH_TYPE)) {
- // AjaxRendererUtils.addRegionByName(facesContext,
- // this,
- // this.getId());
- // }
- //}
+ @Override
+ public void broadcast(FacesEvent event) throws AbortProcessingException {
+ super.broadcast(event);
+
+ if (event instanceof SimpleTogglePanelSwitchEvent) {
+ SimpleTogglePanelSwitchEvent switchEvent = (SimpleTogglePanelSwitchEvent) event;
+
+ setOpened(switchEvent.isOpened());
+
+ try {
+ updateModel();
+ } catch (RuntimeException e) {
+ getFacesContext().renderResponse();
+ throw e;
+ }
+ }
+ }
+
+ private Object value;
+
+ protected Object getLocalValue() {
+ return value;
+ }
+
+ @Override
+ public Object getValue() {
+ if (this.value != null) {
+ return this.value;
+ }
+
+ ValueExpression ve = getValueExpression("value");
+ if (ve != null) {
+ FacesContext context = getFacesContext();
+
+ try {
+ return ve.getValue(context.getELContext());
+ } catch (ELException e) {
+ throw new FacesException(e);
+ }
+ }
+
+ return null;
+ }
+
+ @Override
+ public void setValue(Object value) {
+ this.value = value;
+ }
+
+ @Override
+ public Object saveState(FacesContext context) {
+ Object[] state = new Object[2];
+
+ state[0] = super.saveState(context);
+ state[1] = this.value;
+
+ return state;
+ }
+
+ @Override
+ public void restoreState(FacesContext context, Object stateObject) {
+ Object[] state = (Object[]) stateObject;
+
+ super.restoreState(context, state[0]);
+ this.value = state[1];
+ }
+
+ public Object getIterationState() {
+ Object[] state = new Object[2];
+
+ state[0] = this.value;
+ state[1] = this.wasOpened;
+
+ return state;
+ }
+
+ public void setIterationState(Object stateObject) {
+ if (stateObject != null) {
+ Object[] state = (Object[]) stateObject;
+
+ this.value = state[0];
+ this.wasOpened = (Boolean) state[1];
+ } else {
+ this.value = null;
+ this.wasOpened = null;
+ }
+ }
+
+ protected void updateModel() {
+ Object value = getLocalValue();
+ if (value != null) {
+ ValueExpression ve = getValueExpression("value");
+ if (ve != null) {
+ FacesContext context = getFacesContext();
+ try {
+ ve.setValue(context.getELContext(), value);
+ setValue(null);
+ } catch (ELException e) {
+ String messageStr = e.getMessage();
+ Throwable result = e.getCause();
+ while (null != result &&
+ result.getClass().isAssignableFrom(ELException.class)) {
+ messageStr = result.getMessage();
+ result = result.getCause();
+ }
+ FacesMessage message;
+ if (null == messageStr) {
+ message =
+ //not an UIInput, but constant is fine
+ MessageUtil.getMessage(context, UIInput.UPDATE_MESSAGE_ID, new Object[] {
+ MessageUtil.getLabel(context, this)
+ });
+ } else {
+ message = new FacesMessage(FacesMessage.SEVERITY_ERROR,
+ messageStr,
+ messageStr);
+ }
+
+ context.getExternalContext().log(message.getSummary(), result);
+ context.addMessage(getClientId(context), message);
+ context.renderResponse();
+ } catch (IllegalArgumentException e) {
+ FacesMessage message =
+ MessageUtil.getMessage(context, UIInput.UPDATE_MESSAGE_ID, new Object[] {
+ MessageUtil.getLabel(context, this)
+ });
+
+ context.getExternalContext().log(message.getSummary(), e);
+ context.addMessage(getClientId(context), message);
+ context.renderResponse();
+ } catch (Exception e) {
+ FacesMessage message =
+ MessageUtil.getMessage(context, UIInput.UPDATE_MESSAGE_ID, new Object[] {
+ MessageUtil.getLabel(context, this)
+ });
+
+ context.getExternalContext().log(message.getSummary(), e);
+ context.addMessage(getClientId(context), message);
+ context.renderResponse();
+ }
+ }
+ }
+ }
+
}
Added: trunk/ui/simpleTogglePanel/src/main/java/org/richfaces/event/SimpleTogglePanelSwitchEvent.java
===================================================================
--- trunk/ui/simpleTogglePanel/src/main/java/org/richfaces/event/SimpleTogglePanelSwitchEvent.java (rev 0)
+++ trunk/ui/simpleTogglePanel/src/main/java/org/richfaces/event/SimpleTogglePanelSwitchEvent.java 2009-01-28 14:25:42 UTC (rev 12466)
@@ -0,0 +1,67 @@
+/**
+ * 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.event;
+
+import javax.faces.component.UIComponent;
+import javax.faces.event.FacesEvent;
+import javax.faces.event.FacesListener;
+
+/**
+ * @author Nick Belaevski
+ * @since 3.3.1
+ */
+
+public class SimpleTogglePanelSwitchEvent extends FacesEvent {
+
+ /**
+ *
+ */
+ private static final long serialVersionUID = 6963467503194963330L;
+
+ private boolean opened;
+
+ public SimpleTogglePanelSwitchEvent(UIComponent component, boolean opened) {
+ super(component);
+
+ this.opened = opened;
+ }
+
+ /* (non-Javadoc)
+ * @see javax.faces.event.FacesEvent#isAppropriateListener(javax.faces.event.FacesListener)
+ */
+ @Override
+ public boolean isAppropriateListener(FacesListener listener) {
+ return false;
+ }
+
+ /* (non-Javadoc)
+ * @see javax.faces.event.FacesEvent#processListener(javax.faces.event.FacesListener)
+ */
+ @Override
+ public void processListener(FacesListener listener) {
+ throw new UnsupportedOperationException();
+ }
+
+ public boolean isOpened() {
+ return opened;
+ }
+}
Modified: trunk/ui/simpleTogglePanel/src/main/java/org/richfaces/renderkit/html/SimpleTogglePanelRenderer.java
===================================================================
--- trunk/ui/simpleTogglePanel/src/main/java/org/richfaces/renderkit/html/SimpleTogglePanelRenderer.java 2009-01-28 14:16:38 UTC (rev 12465)
+++ trunk/ui/simpleTogglePanel/src/main/java/org/richfaces/renderkit/html/SimpleTogglePanelRenderer.java 2009-01-28 14:25:42 UTC (rev 12466)
@@ -38,6 +38,7 @@
import org.ajax4jsf.renderkit.RendererUtils;
import org.richfaces.component.UISimpleTogglePanel;
import org.richfaces.event.SimpleToggleEvent;
+import org.richfaces.event.SimpleTogglePanelSwitchEvent;
//public class SimpleTogglePanelRenderer extends AjaxCommandLinkRenderer {
@@ -46,7 +47,7 @@
final static String NONE = "none";
final static String EMPTY = "";
- protected Class getComponentClass() {
+ protected Class<? extends UIComponent> getComponentClass() {
return UISimpleTogglePanel.class;
}
@@ -70,47 +71,25 @@
UISimpleTogglePanel panel = (UISimpleTogglePanel) component;
if (clnId != null) {
+ boolean currentState = panel.isOpened();
+ boolean submittedState = false;
+
// enqueue event here for this component or for component with Id
// taken fro forId attribute
-
String switchType = panel.getSwitchType();
- if (!(UISimpleTogglePanel.CLIENT_SWITCH_TYPE.equals(switchType))) {
- // xxxx by nick - denis - use constants, please!
- SimpleToggleEvent event;
- if (panel.isOpened()) {
- event = new SimpleToggleEvent(panel, UISimpleTogglePanel.COLLAPSED);
- // panel.setOpened(UISimpleTogglePanel.COLLAPSED);
- // panel.setOpenedSet(UISimpleTogglePanel.COLLAPSED);
- } else {
- event = new SimpleToggleEvent(panel, UISimpleTogglePanel.EXPANDED);
- // xxxx by nick - denis - use constants, please!
- // panel.setOpened(UISimpleTogglePanel.EXPANDED);
- // panel.setOpenedSet(UISimpleTogglePanel.EXPANDED);
- }
- // if (panel.isImmediate()) {
- // event.setPhaseId(PhaseId.APPLY_REQUEST_VALUES);
- // } else {
- // event.setPhaseId(PhaseId.INVOKE_APPLICATION);
- // }
+ if (UISimpleTogglePanel.CLIENT_SWITCH_TYPE.equals(switchType)) {
+ submittedState = Boolean.parseBoolean((String) clnId);
+ } else {
+ submittedState = !currentState;
+ }
+
+ if (currentState != submittedState) {
+ SimpleToggleEvent event = new SimpleToggleEvent(panel, submittedState);
event.queue();
- } else {
- boolean submittedState = Boolean.parseBoolean((String) clnId);
- if (panel.isOpened() != submittedState) {
- // panel.setAjaxSingle(false);
- SimpleToggleEvent event = new SimpleToggleEvent(panel, submittedState);
- // if (panel.isImmediate()) {
- // event.setPhaseId(PhaseId.APPLY_REQUEST_VALUES);
- // } else {
- // event.setPhaseId(PhaseId.INVOKE_APPLICATION);
- // }
- event.queue();
- }
-// TODO: should we remove it ??
- if (null == panel.getValueBinding("value"))
- panel.setOpened(submittedState);
- // panel.setOpenedSet(submittedState);
+ SimpleTogglePanelSwitchEvent stateEvent = new SimpleTogglePanelSwitchEvent(panel, submittedState);
+ stateEvent.queue();
}
// in case of "ajax" request and "ajax" switch mode of toggle panel
@@ -196,7 +175,7 @@
public void encodeChildren(FacesContext context, UIComponent component) throws IOException {
UISimpleTogglePanel comp = (UISimpleTogglePanel) component;
- if (!(((comp.getSwitchType() == null) || (comp.getSwitchType().equals(UISimpleTogglePanel.CLIENT_SWITCH_TYPE) != true)) && (comp.isOpened() == UISimpleTogglePanel.COLLAPSED)))
+ if (!(((comp.getSwitchType() == null) || (comp.getSwitchType().equals(UISimpleTogglePanel.CLIENT_SWITCH_TYPE) != true)) && (!comp.isOpened())))
{
super.encodeChildren(context, component);
}
Modified: trunk/ui/simpleTogglePanel/src/main/java/org/richfaces/taglib/SimpleTogglePanelTagHandlerBase.java
===================================================================
--- trunk/ui/simpleTogglePanel/src/main/java/org/richfaces/taglib/SimpleTogglePanelTagHandlerBase.java 2009-01-28 14:16:38 UTC (rev 12465)
+++ trunk/ui/simpleTogglePanel/src/main/java/org/richfaces/taglib/SimpleTogglePanelTagHandlerBase.java 2009-01-28 14:25:42 UTC (rev 12466)
@@ -22,8 +22,6 @@
import javax.faces.context.FacesContext;
-import org.ajax4jsf.webapp.taglib.AjaxComponentHandler;
-
import com.sun.facelets.tag.MetaRuleset;
import com.sun.facelets.tag.TagAttribute;
import com.sun.facelets.tag.TagAttributes;
16 years, 1 month
JBoss Rich Faces SVN: r12465 - trunk/sandbox/samples/maven-rd-plugin-sample.
by richfaces-svn-commits＠lists.jboss.org
Author: abelevich
Date: 2009-01-28 09:16:38 -0500 (Wed, 28 Jan 2009)
New Revision: 12465
Modified:
trunk/sandbox/samples/maven-rd-plugin-sample/pom.xml
Log:
Modified: trunk/sandbox/samples/maven-rd-plugin-sample/pom.xml
===================================================================
--- trunk/sandbox/samples/maven-rd-plugin-sample/pom.xml 2009-01-28 14:14:45 UTC (rev 12464)
+++ trunk/sandbox/samples/maven-rd-plugin-sample/pom.xml 2009-01-28 14:16:38 UTC (rev 12465)
@@ -25,10 +25,6 @@
<groupId>org.richfaces.cdk.sandbox</groupId>
<version>3.3.1-SNAPSHOT</version>
<configuration>
- <namespaces>
- <namespace>http://richfaces.org/rich</namespace>
- <namespace>http://richfaces.org/a4j</namespace>
- </namespaces>
<outputScriptDirectory>
${basedir}/src/main/webapp/scripts
</outputScriptDirectory>
16 years, 1 month
JBoss Rich Faces SVN: r12464 - in trunk/test-applications/seleniumTest/richfaces/src: main/webapp/pages/dataGrid and 1 other directories.
by richfaces-svn-commits＠lists.jboss.org
Author: konstantin.mishin
Date: 2009-01-28 09:14:45 -0500 (Wed, 28 Jan 2009)
New Revision: 12464
Modified:
trunk/test-applications/seleniumTest/richfaces/src/main/java/org/ajax4jsf/bean/DataGridBean.java
trunk/test-applications/seleniumTest/richfaces/src/main/webapp/pages/dataGrid/dataGrid.xhtml
trunk/test-applications/seleniumTest/richfaces/src/test/java/org/richfaces/testng/DataGridTest.java
Log:
RF-5678
Modified: trunk/test-applications/seleniumTest/richfaces/src/main/java/org/ajax4jsf/bean/DataGridBean.java
===================================================================
--- trunk/test-applications/seleniumTest/richfaces/src/main/java/org/ajax4jsf/bean/DataGridBean.java 2009-01-28 13:43:19 UTC (rev 12463)
+++ trunk/test-applications/seleniumTest/richfaces/src/main/java/org/ajax4jsf/bean/DataGridBean.java 2009-01-28 14:14:45 UTC (rev 12464)
@@ -1,7 +1,9 @@
package org.ajax4jsf.bean;
import java.util.ArrayList;
+import java.util.HashSet;
import java.util.List;
+import java.util.Set;
import javax.faces.application.FacesMessage;
import javax.faces.component.UIComponent;
@@ -52,6 +54,7 @@
private List<Element> model;
private int elements;
private String trace;
+ private Set<Integer> ajaxKeys;
public DataGridBean() {
init();
@@ -64,12 +67,24 @@
}
elements = 0;
trace = "";
+ ajaxKeys = new HashSet<Integer>(10);
+ for (int i = 0; i < 10; i++) {
+ if (i != 2 && i != 6) {
+ ajaxKeys.add(i);
+ }
+ }
}
public void submit(ActionEvent event) {
trace = event.getComponent().getClientId(FacesContext.getCurrentInstance());
}
+ public void reRender(ActionEvent event) {
+ for (Element element : model) {
+ element.setCell2("XXX");
+ }
+ }
+
public void setModel(List<Element> model) {
this.model = model;
}
@@ -100,4 +115,12 @@
throw new ValidatorException(new FacesMessage("validation failure"));
}
}
+
+ public void setAjaxKeys(Set<Integer> ajaxKeys) {
+ this.ajaxKeys = ajaxKeys;
+ }
+
+ public Set<Integer> getAjaxKeys() {
+ return ajaxKeys;
+ }
}
Modified: trunk/test-applications/seleniumTest/richfaces/src/main/webapp/pages/dataGrid/dataGrid.xhtml
===================================================================
--- trunk/test-applications/seleniumTest/richfaces/src/main/webapp/pages/dataGrid/dataGrid.xhtml 2009-01-28 13:43:19 UTC (rev 12463)
+++ trunk/test-applications/seleniumTest/richfaces/src/main/webapp/pages/dataGrid/dataGrid.xhtml 2009-01-28 14:14:45 UTC (rev 12464)
@@ -23,16 +23,17 @@
</h:selectBooleanCheckbox-->
</h:form>
<h:form id="mainForm">
- <rich:dataGrid id="dataGrid" value="#{dataGrid.model}" var="element" elements="#{dataGrid.elements}">
+ <rich:dataGrid id="dataGrid" value="#{dataGrid.model}" var="element" elements="#{dataGrid.elements}" ajaxKeys="#{dataGrid.ajaxKeys}">
<h:panelGroup>
<h:outputText value="#{element.cell1}"></h:outputText>
- <h:inputText value="#{element.cell2}" validator="#{dataGrid.validate}"></h:inputText>
+ <h:inputText id="inputText" value="#{element.cell2}" validator="#{dataGrid.validate}"></h:inputText>
<h:outputText value="#{element.cell3}"></h:outputText>
<h:commandButton id="submit" value="submit" actionListener="#{dataGrid.submit}"></h:commandButton>
<a4j:commandButton id="ajaxSubmit" value="ajaxSubmit" actionListener="#{dataGrid.submit}"></a4j:commandButton>
<a4j:commandButton id="ajaxSingleSubmit" value="ajaxSingleSubmit" actionListener="#{dataGrid.submit}" ajaxSingle="true"></a4j:commandButton>
</h:panelGroup>
</rich:dataGrid>
+ <a4j:commandButton id="reRender" value="reRender" reRender="inputText" actionListener="#{dataGrid.reRender}"></a4j:commandButton>
</h:form>
<a4j:outputPanel ajaxRendered="true">
<h:outputText id="outputText" value="#{dataGrid.trace}"></h:outputText>
Modified: trunk/test-applications/seleniumTest/richfaces/src/test/java/org/richfaces/testng/DataGridTest.java
===================================================================
--- trunk/test-applications/seleniumTest/richfaces/src/test/java/org/richfaces/testng/DataGridTest.java 2009-01-28 13:43:19 UTC (rev 12463)
+++ trunk/test-applications/seleniumTest/richfaces/src/test/java/org/richfaces/testng/DataGridTest.java 2009-01-28 14:14:45 UTC (rev 12464)
@@ -13,6 +13,8 @@
private String dataGrid;
+ private String reRender;
+
private String outputText;
private String dataTable;
@@ -23,6 +25,7 @@
elements = attrForm + ":elements";
String mainForm = getParentId() + "mainForm";
dataGrid = mainForm + ":dataGrid";
+ reRender = mainForm + ":reRender";
outputText = getParentId() + "outputText";
dataTable = getParentId() + "dataTable";
}
@@ -71,6 +74,17 @@
chekStructure(3, 6);
}
+ /**
+ * rows defined by ajaxKeys attribute are re-rendered correctly
+ */
+ @Test
+ public void testAjaxKeys(Template template) {
+ init(template);
+ chekStructure();
+ clickAjaxCommandAndWait(reRender);
+ chekStructure(3, 7);
+ }
+
private void chekStructure(int ... notEqualRows) {
String dataTableRowLocator = "id('"+ dataTable + "')/tbody/tr";
int count = selenium.getXpathCount(dataTableRowLocator).intValue();
16 years, 1 month
JBoss Rich Faces SVN: r12463 - in trunk/test-applications/realworld: ear and 1 other directories.
by richfaces-svn-commits＠lists.jboss.org
Author: andrei_exadel
Date: 2009-01-28 08:43:19 -0500 (Wed, 28 Jan 2009)
New Revision: 12463
Modified:
trunk/test-applications/realworld/ear/pom.xml
trunk/test-applications/realworld/pom.xml
trunk/test-applications/realworld/tests/pom.xml
Log:
Move integration tests to separate project 'tests'
Modified: trunk/test-applications/realworld/ear/pom.xml
===================================================================
--- trunk/test-applications/realworld/ear/pom.xml 2009-01-28 13:34:24 UTC (rev 12462)
+++ trunk/test-applications/realworld/ear/pom.xml 2009-01-28 13:43:19 UTC (rev 12463)
@@ -86,77 +86,7 @@
</modules>
</configuration>
</plugin>
- <plugin>
- <groupId>org.codehaus.cargo</groupId>
- <artifactId>cargo-maven2-plugin</artifactId>
- <version>1.0-beta-2</version>
- <executions>
- <execution>
- <id>start-container</id>
- <phase>pre-integration-test</phase>
- <goals>
- <goal>deploy</goal>
- <goal>start</goal>
- </goals>
- </execution>
- <execution>
- <id>stop-container</id>
- <phase>post-integration-test</phase>
- <goals>
- <goal>stop</goal>
- <!--goal>undeploy</goal-->
- </goals>
- </execution>
- </executions>
- <configuration>
- <wait>false</wait>
- <container>
- <containerId>jboss4x</containerId>
- <append>false</append>
-
- <zipUrlInstaller>
- <url>${jboss.installer.url}</url>
- <installDir>
- ${project.basedir}/target/installs
- </installDir>
- </zipUrlInstaller>
- </container>
- <configuration>
- <home>${jbosshome}/server/${jbosscontext}</home>
- <type>existing</type>
- <properties>
- <cargo.hostname>localhost</cargo.hostname>
- <cargo.jboss.configuration>${jbosscontext}</cargo.jboss.configuration>
- <cargo.rmi.port>1099</cargo.rmi.port>
- </properties>
- </configuration>
- <deployer>
- <type>installed</type>
- <deployables>
- <deployable>
- <artifactId>${projectName}-ear</artifactId>
- <type>ear</type>
- </deployable>
- </deployables>
- </deployer>
- </configuration>
- </plugin>
+
</plugins>
</build>
-
- <properties>
- <jbosshome>${project.basedir}/target/installs/jboss-4.2.3.GA/jboss-4.2.3.GA</jbosshome>
- <jbosscontext>default</jbosscontext>
- <jboss.installer.url>file:D:\Install\Java\jboss-4.2.3.GA.zip</jboss.installer.url>
- </properties>
-
- <profiles>
- <profile>
- <id>hudson</id>
- <properties>
- <jboss.installer.url>http://internap.dl.sourceforge.net/sourceforge/jboss/jboss-4.2.3.GA.zip</jboss.installer.url>
- </properties>
- </profile>
- </profiles>
-
</project>
Modified: trunk/test-applications/realworld/pom.xml
===================================================================
--- trunk/test-applications/realworld/pom.xml 2009-01-28 13:34:24 UTC (rev 12462)
+++ trunk/test-applications/realworld/pom.xml 2009-01-28 13:43:19 UTC (rev 12463)
@@ -17,6 +17,9 @@
<richfacesVersion>3.3.1-SNAPSHOT</richfacesVersion>
<seamVersion>2.1.0.SP1</seamVersion>
<faceletsVersion>1.1.14</faceletsVersion>
+ <jbosshome>${project.basedir}/target/installs/jboss-4.2.3.GA/jboss-4.2.3.GA</jbosshome>
+ <jbosscontext>default</jbosscontext>
+ <jboss.installer.url>file:D:\Install\Java\jboss-4.2.3.GA.zip</jboss.installer.url>
</properties>
<repositories>
<repository>
@@ -34,7 +37,7 @@
<module>ear</module>
<module>ejb</module>
<module>web</module>
- <module>tests</module>
+ <!--module>tests</module-->
</modules>
<build>
<plugins>
@@ -77,4 +80,14 @@
</pluginManagement>
</build>
+
+ <profiles>
+ <profile>
+ <id>hudson</id>
+ <properties>
+ <jboss.installer.url>http://internap.dl.sourceforge.net/sourceforge/jboss/jboss-4.2.3.GA.zip</jboss.installer.url>
+ </properties>
+ </profile>
+ </profiles>
+
</project>
\ No newline at end of file
Modified: trunk/test-applications/realworld/tests/pom.xml
===================================================================
--- trunk/test-applications/realworld/tests/pom.xml 2009-01-28 13:34:24 UTC (rev 12462)
+++ trunk/test-applications/realworld/tests/pom.xml 2009-01-28 13:43:19 UTC (rev 12463)
@@ -11,6 +11,13 @@
<version>1.0-SNAPSHOT</version>
<packaging>jar</packaging>
<dependencies>
+ <dependency>
+ <groupId>org.richfaces</groupId>
+ <artifactId>${projectName}-ear</artifactId>
+ <version>${project.version}</version>
+ <type>ear</type>
+ <scope>provided</scope>
+ </dependency>
<dependency>
<groupId>org.testng</groupId>
<artifactId>testng</artifactId>
@@ -93,6 +100,61 @@
</execution>
</executions>
</plugin>
+ <plugin>
+ <groupId>org.codehaus.cargo</groupId>
+ <artifactId>cargo-maven2-plugin</artifactId>
+ <version>1.0-beta-2</version>
+ <executions>
+ <execution>
+ <id>start-container</id>
+ <phase>pre-integration-test</phase>
+ <goals>
+ <goal>deploy</goal>
+ <goal>start</goal>
+ </goals>
+ </execution>
+ <execution>
+ <id>stop-container</id>
+ <phase>post-integration-test</phase>
+ <goals>
+ <goal>stop</goal>
+ <!--goal>undeploy</goal-->
+ </goals>
+ </execution>
+ </executions>
+ <configuration>
+ <wait>false</wait>
+ <container>
+ <containerId>jboss4x</containerId>
+ <append>false</append>
+
+ <zipUrlInstaller>
+ <url>${jboss.installer.url}</url>
+ <installDir>
+ ${project.basedir}/target/installs
+ </installDir>
+ </zipUrlInstaller>
+ </container>
+ <configuration>
+ <home>${jbosshome}/server/${jbosscontext}</home>
+ <type>existing</type>
+ <properties>
+ <cargo.hostname>localhost</cargo.hostname>
+ <cargo.jboss.configuration>${jbosscontext}</cargo.jboss.configuration>
+ <cargo.rmi.port>1099</cargo.rmi.port>
+ </properties>
+ </configuration>
+ <deployer>
+ <type>installed</type>
+ <deployables>
+ <deployable>
+ <artifactId>${projectName}-ear</artifactId>
+ <type>ear</type>
+ </deployable>
+ </deployables>
+ </deployer>
+ </configuration>
+ </plugin>
<plugin>
<groupId>org.apache.maven.plugins</groupId>
<artifactId>maven-compiler-plugin</artifactId>
16 years, 1 month
JBoss Rich Faces SVN: r12462 - trunk/sandbox/samples/maven-rd-plugin-sample.
by richfaces-svn-commits＠lists.jboss.org
Author: abelevich
Date: 2009-01-28 08:34:24 -0500 (Wed, 28 Jan 2009)
New Revision: 12462
Modified:
trunk/sandbox/samples/maven-rd-plugin-sample/pom.xml
Log:
Modified: trunk/sandbox/samples/maven-rd-plugin-sample/pom.xml
===================================================================
--- trunk/sandbox/samples/maven-rd-plugin-sample/pom.xml 2009-01-28 13:34:03 UTC (rev 12461)
+++ trunk/sandbox/samples/maven-rd-plugin-sample/pom.xml 2009-01-28 13:34:24 UTC (rev 12462)
@@ -41,13 +41,7 @@
<outputStyleDirectory>
${basedir}/src/main/webapp/styles
</outputStyleDirectory>
- <beforeStyleIncludes>
- <beforeStyleInclude>org/test/styles/before.css</beforeStyleInclude>
- </beforeStyleIncludes>
- <afterStyleIncludes>
- <afterStyleInclude>org/test/styles/after.css</afterStyleInclude>
- </afterStyleIncludes>
- </configuration>
+ </configuration>
<executions>
<execution>
<phase>process-resources</phase>
16 years, 1 month
JBoss Rich Faces SVN: r12461 - in trunk/sandbox/samples/maven-rd-plugin-sample/src/main/webapp: pages and 1 other directory.
by richfaces-svn-commits＠lists.jboss.org
Author: abelevich
Date: 2009-01-28 08:34:03 -0500 (Wed, 28 Jan 2009)
New Revision: 12461
Modified:
trunk/sandbox/samples/maven-rd-plugin-sample/src/main/webapp/WEB-INF/web.xml
trunk/sandbox/samples/maven-rd-plugin-sample/src/main/webapp/pages/index.xhtml
trunk/sandbox/samples/maven-rd-plugin-sample/src/main/webapp/pages/oneMorePage.xhtml
Log:
Modified: trunk/sandbox/samples/maven-rd-plugin-sample/src/main/webapp/WEB-INF/web.xml
===================================================================
--- trunk/sandbox/samples/maven-rd-plugin-sample/src/main/webapp/WEB-INF/web.xml 2009-01-28 13:33:31 UTC (rev 12460)
+++ trunk/sandbox/samples/maven-rd-plugin-sample/src/main/webapp/WEB-INF/web.xml 2009-01-28 13:34:03 UTC (rev 12461)
@@ -18,8 +18,14 @@
<param-name>org.richfaces.LoadScriptStrategy</param-name>
<param-value>NONE</param-value>
</context-param>
-
-
+<context-param>
+ <param-name>org.ajax4jsf.RESOURCE_URI_PREFIX</param-name>
+ <param-value>rfRes</param-value>
+</context-param>
+<context-param>
+ <param-name>org.richfaces.LoadStyleStrategy</param-name>
+ <param-value>NONE </param-value>
+</context-param>
<context-param>
<param-name>javax.faces.DEFAULT_SUFFIX</param-name>
<param-value>.xhtml</param-value>
Modified: trunk/sandbox/samples/maven-rd-plugin-sample/src/main/webapp/pages/index.xhtml
===================================================================
--- trunk/sandbox/samples/maven-rd-plugin-sample/src/main/webapp/pages/index.xhtml 2009-01-28 13:33:31 UTC (rev 12460)
+++ trunk/sandbox/samples/maven-rd-plugin-sample/src/main/webapp/pages/index.xhtml 2009-01-28 13:34:03 UTC (rev 12461)
@@ -8,9 +8,9 @@
xmlns:c="http://java.sun.com/jsp/jstl/core"
>
<head>
- <script src="scripts/custom-dependencies.js" type="text/javascript">
- </script>
- </head>
+ <script src="#{facesContext.externalContext.requestContextPath}/faces/rfResscripts/custom-dependencies.js" type="text/javascript"> </script>
+ <link rel="stylesheet" href="#{facesContext.externalContext.requestContextPath}/faces/rfRescss/custom-dependencies.xcss" type="text/css" />
+ </head>
<f:view>
<h:form>
Modified: trunk/sandbox/samples/maven-rd-plugin-sample/src/main/webapp/pages/oneMorePage.xhtml
===================================================================
--- trunk/sandbox/samples/maven-rd-plugin-sample/src/main/webapp/pages/oneMorePage.xhtml 2009-01-28 13:33:31 UTC (rev 12460)
+++ trunk/sandbox/samples/maven-rd-plugin-sample/src/main/webapp/pages/oneMorePage.xhtml 2009-01-28 13:34:03 UTC (rev 12461)
@@ -10,6 +10,8 @@
<head>
<script src="../scripts/custom-dependencies.js" type="text/javascript">
</script>
+ <link class="component" href="../styles/custom-dependencies.xss" rel="stylesheet" type="text/css" />
+
</head>
<f:view>
16 years, 1 month
JBoss Rich Faces SVN: r12460 - trunk/sandbox/cdk/maven-resource-dependency-plugin/src/main/java/org/richfaces/cdk/rd/generator.
by richfaces-svn-commits＠lists.jboss.org
Author: abelevich
Date: 2009-01-28 08:33:31 -0500 (Wed, 28 Jan 2009)
New Revision: 12460
Modified:
trunk/sandbox/cdk/maven-resource-dependency-plugin/src/main/java/org/richfaces/cdk/rd/generator/ScriptAssembler.java
Log:
fix script generation
Modified: trunk/sandbox/cdk/maven-resource-dependency-plugin/src/main/java/org/richfaces/cdk/rd/generator/ScriptAssembler.java
===================================================================
--- trunk/sandbox/cdk/maven-resource-dependency-plugin/src/main/java/org/richfaces/cdk/rd/generator/ScriptAssembler.java 2009-01-28 13:12:20 UTC (rev 12459)
+++ trunk/sandbox/cdk/maven-resource-dependency-plugin/src/main/java/org/richfaces/cdk/rd/generator/ScriptAssembler.java 2009-01-28 13:33:31 UTC (rev 12460)
@@ -44,6 +44,7 @@
log.info("process resource : " + resource.getFile());
try {
builder.append(IOUtil.toString(resource.openStream()));
+ builder.append("\n");
} catch (IOException e) {
log.error("Error read resource: " + resource.getFile());
}
16 years, 1 month
JBoss Rich Faces SVN: r12459 - trunk/docs/common-resources/en/src/main/xslt.
by richfaces-svn-commits＠lists.jboss.org
Author: artdaw
Date: 2009-01-28 08:12:20 -0500 (Wed, 28 Jan 2009)
New Revision: 12459
Modified:
trunk/docs/common-resources/en/src/main/xslt/xhtml-common.xsl
Log:
https://jira.jboss.org/jira/browse/RF-5833 - feedback was implemented without php and prototype
Modified: trunk/docs/common-resources/en/src/main/xslt/xhtml-common.xsl
===================================================================
--- trunk/docs/common-resources/en/src/main/xslt/xhtml-common.xsl 2009-01-28 13:11:17 UTC (rev 12458)
+++ trunk/docs/common-resources/en/src/main/xslt/xhtml-common.xsl 2009-01-28 13:12:20 UTC (rev 12459)
@@ -11,7 +11,7 @@
<xsl:import href="collapsing-navigation.xsl"/>
<!--xsl:param name="generate.toc" select="'book toc'"/-->
<xsl:param name="toc.section.depth" select="5"/>
-
+
<!--
From: xhtml/docbook.xsl
16 years, 1 month