JBoss Rich Faces SVN: r8272 - trunk/ui/fileUpload/src/main/config/component.
by richfaces-svn-commits＠lists.jboss.org
Author: andrei_exadel
Date: 2008-04-29 05:15:43 -0400 (Tue, 29 Apr 2008)
New Revision: 8272
Modified:
trunk/ui/fileUpload/src/main/config/component/fileUpload.xml
Log:
remove unnecessary attributes
Modified: trunk/ui/fileUpload/src/main/config/component/fileUpload.xml
===================================================================
--- trunk/ui/fileUpload/src/main/config/component/fileUpload.xml 2008-04-28 23:28:14 UTC (rev 8271)
+++ trunk/ui/fileUpload/src/main/config/component/fileUpload.xml 2008-04-29 09:15:43 UTC (rev 8272)
@@ -397,6 +397,30 @@
<name>accessKey</name>
<classname>java.lang.Object</classname>
</property>
+ <property hidden="true" existintag="false" exist="false" >
+ <name>align</name>
+ <classname>java.lang.Object</classname>
+ </property>
+ <property hidden="true" existintag="false" exist="false" >
+ <name>converter</name>
+ <classname>java.lang.Object</classname>
+ </property>
+ <property hidden="true" existintag="false" exist="false" >
+ <name>valueChangeListener</name>
+ <classname>java.lang.Object</classname>
+ </property>
+ <property hidden="true" existintag="false" exist="false" >
+ <name>converterMessage</name>
+ <classname>java.lang.Object</classname>
+ </property>
+ <property hidden="true" existintag="false" exist="false" >
+ <name>validator</name>
+ <classname>java.lang.Object</classname>
+ </property>
+ <property hidden="true" existintag="false" exist="false" >
+ <name>validatorMessage</name>
+ <classname>java.lang.Object</classname>
+ </property>
</component>
&listeners;
</components>
16 years, 8 months
JBoss Rich Faces SVN: r8271 - in trunk/docs: userguide and 1 other directories.
by richfaces-svn-commits＠lists.jboss.org
Author: artdaw
Date: 2008-04-28 19:28:14 -0400 (Mon, 28 Apr 2008)
New Revision: 8271
Modified:
trunk/docs/pom.xml
trunk/docs/userguide/pom.xml
trunk/docs/xslt/en/pom.xml
Log:
http://jira.jboss.org/jira/browse/RF-3189 - xslt styles were returned
Modified: trunk/docs/pom.xml
===================================================================
--- trunk/docs/pom.xml 2008-04-28 22:19:49 UTC (rev 8270)
+++ trunk/docs/pom.xml 2008-04-28 23:28:14 UTC (rev 8271)
@@ -82,7 +82,7 @@
<modules>
<module>highlight</module>
-
+ <module>xslt</module>
<!--
<module>docbook</module>
<module>maven-docbook-plugin</module>
Modified: trunk/docs/userguide/pom.xml
===================================================================
--- trunk/docs/userguide/pom.xml 2008-04-28 22:19:49 UTC (rev 8270)
+++ trunk/docs/userguide/pom.xml 2008-04-28 23:28:14 UTC (rev 8271)
@@ -708,6 +708,12 @@
<version>1.1.0-SNAPSHOT</version>
<type>jdocbook-style</type>
</dependency>
+ <!--dependency>
+ <groupId>org.richfaces.docs.xslt</groupId>
+ <artifactId>${translation}</artifactId>
+ <version>${project.version}</version>
+ <type>jar</type>
+ </dependency-->
<dependency>
<groupId>org.apache.xmlgraphics</groupId>
<artifactId>fop</artifactId>
Modified: trunk/docs/xslt/en/pom.xml
===================================================================
--- trunk/docs/xslt/en/pom.xml 2008-04-28 22:19:49 UTC (rev 8270)
+++ trunk/docs/xslt/en/pom.xml 2008-04-28 23:28:14 UTC (rev 8271)
@@ -35,13 +35,13 @@
<targetPath>images</targetPath>
</resource>
</resources>
- <plugins>
+ <!--plugins>
<plugin>
<groupId>org.jboss.maven.plugins</groupId>
<artifactId>maven-jdocbook-style-plugin</artifactId>
<version>1.0.0</version>
<extensions>true</extensions>
</plugin>
- </plugins>
+ </plugins-->
</build>
</project>
\ No newline at end of file
16 years, 8 months
JBoss Rich Faces SVN: r8270 - in trunk: framework/impl/src/main/java/org/ajax4jsf/application and 2 other directories.
by richfaces-svn-commits＠lists.jboss.org
Author: alexsmirnov
Date: 2008-04-28 18:19:49 -0400 (Mon, 28 Apr 2008)
New Revision: 8270
Modified:
trunk/framework/api/src/main/java/org/ajax4jsf/application/StateHolder.java
trunk/framework/impl/src/main/java/org/ajax4jsf/application/AjaxStateHolder.java
trunk/framework/impl/src/main/java/org/ajax4jsf/application/AjaxStateManager.java
trunk/framework/test/src/test/java/org/ajax4jsf/application/AjaxStateHolderTest.java
trunk/ui/dataTable/src/main/java/org/richfaces/component/UIDataGrid.java
Log:
fix http://jira.jboss.com/jira/browse/RF-1924 , http://jira.jboss.com/jira/browse/RF-2076
Modified: trunk/framework/api/src/main/java/org/ajax4jsf/application/StateHolder.java
===================================================================
--- trunk/framework/api/src/main/java/org/ajax4jsf/application/StateHolder.java 2008-04-28 21:02:55 UTC (rev 8269)
+++ trunk/framework/api/src/main/java/org/ajax4jsf/application/StateHolder.java 2008-04-28 22:19:49 UTC (rev 8270)
@@ -2,8 +2,8 @@
public interface StateHolder {
- public Object getState(String viewId, Object sequence);
+ public Object getState(String viewId, String sequence);
- public void saveState(String viewId, Object sequence, Object state);
+ public void saveState(String viewId, String sequence, Object state);
}
\ No newline at end of file
Modified: trunk/framework/impl/src/main/java/org/ajax4jsf/application/AjaxStateHolder.java
===================================================================
--- trunk/framework/impl/src/main/java/org/ajax4jsf/application/AjaxStateHolder.java 2008-04-28 21:02:55 UTC (rev 8269)
+++ trunk/framework/impl/src/main/java/org/ajax4jsf/application/AjaxStateHolder.java 2008-04-28 22:19:49 UTC (rev 8270)
@@ -24,15 +24,15 @@
/**
*
*/
- private static final long serialVersionUID = 6414488517358423688L;
- private static final Object STATE_HOLDER = AjaxStateHolder.class.getName();
+ private static final long serialVersionUID = 6414488517358423537L;
+ private static final String STATE_HOLDER = AjaxStateHolder.class.getName();
- private final LRUMap views;
+ private final LRUMap<String,LRUMap<String, Object>> views;
private final int numberOfViews;
private AjaxStateHolder(int capacity, int numberOfViews) {
- views = new LRUMap(capacity);
+ views = new LRUMap<String,LRUMap<String, Object>>(capacity);
this.numberOfViews = numberOfViews;
}
@@ -43,7 +43,7 @@
}
ExternalContext externalContext = context.getExternalContext();
Object session = externalContext.getSession(true);
- Map sessionMap = externalContext.getSessionMap();
+ Map<String,Object> sessionMap = externalContext.getSessionMap();
if (_log.isDebugEnabled()) {
_log.debug("Request for a view states holder instance");
}
@@ -75,14 +75,14 @@
/* (non-Javadoc)
* @see org.ajax4jsf.application.StateHolder#getState(java.lang.String, java.lang.Object)
*/
- public Object getState(String viewId, Object sequence) {
+ public Object getState(String viewId, String sequence) {
if (null == viewId) {
throw new NullPointerException(
"viewId parameter for get saved view state is null");
}
Object state = null;
synchronized (views) {
- LRUMap viewVersions = (LRUMap) views.get(viewId);
+ LRUMap<String,Object> viewVersions = views.get(viewId);
if (null != viewVersions) {
if (null != sequence) {
state = viewVersions.get(sequence);
@@ -103,7 +103,7 @@
/* (non-Javadoc)
* @see org.ajax4jsf.application.StateHolder#saveState(java.lang.String, java.lang.Object, java.lang.Object)
*/
- public void saveState(String viewId, Object sequence, Object state) {
+ public void saveState(String viewId, String sequence, Object state) {
if (null == viewId) {
throw new NullPointerException(
"viewId parameter for save view state is null");
@@ -117,10 +117,10 @@
_log.debug("Save new viewState in session for viewId "+viewId+" and sequence "+sequence);
}
synchronized (views) {
- LRUMap viewVersions = (LRUMap) views.get(viewId);
+ LRUMap<String,Object> viewVersions = views.get(viewId);
if (null == viewVersions) {
// TODO - make size parameter configurable
- viewVersions = new LRUMap(this.numberOfViews);
+ viewVersions = new LRUMap<String,Object>(this.numberOfViews);
views.put(viewId, viewVersions);
}
viewVersions.put(sequence, state);
Modified: trunk/framework/impl/src/main/java/org/ajax4jsf/application/AjaxStateManager.java
===================================================================
--- trunk/framework/impl/src/main/java/org/ajax4jsf/application/AjaxStateManager.java 2008-04-28 21:02:55 UTC (rev 8269)
+++ trunk/framework/impl/src/main/java/org/ajax4jsf/application/AjaxStateManager.java 2008-04-28 22:19:49 UTC (rev 8270)
@@ -24,10 +24,12 @@
import java.io.IOException;
import java.lang.reflect.Constructor;
import java.util.HashSet;
+import java.util.Map;
import javax.faces.FactoryFinder;
import javax.faces.application.StateManager;
import javax.faces.component.UIViewRoot;
+import javax.faces.context.ExternalContext;
import javax.faces.context.FacesContext;
import javax.faces.render.RenderKit;
import javax.faces.render.RenderKitFactory;
@@ -101,12 +103,10 @@
private final ComponentsLoader componentLoader;
- private volatile int viewSequence = 0;
+ private static final Log _log = LogFactory.getLog(AjaxStateManager.class);
- private Object viewSequenceMutex = "MUTEX";
+ public static final String VIEW_SEQUENCE_ATTRIBUTE = AjaxStateManager.class.getName()+".view_sequence";
- private static final Log _log = LogFactory.getLog(AjaxStateManager.class);
-
/**
* @param parent
*/
@@ -242,7 +242,7 @@
protected Object[] restoreStateFromSession(FacesContext context,
String viewId, String renderKitId) {
- Object id = restoreLogicalViewId(context, viewId, renderKitId);
+ String id = restoreLogicalViewId(context, viewId, renderKitId);
StateHolder stateHolder = getStateHolder(context);
Object[] restoredState = (Object[]) stateHolder.getState(viewId, id);
return restoredState;
@@ -292,7 +292,7 @@
SerializedView serializedView;
UIViewRoot viewRoot = context.getViewRoot();
StateHolder stateHolder = getStateHolder(context);
- Object id = getLogicalViewId(context);
+ String id = getLogicalViewId(context);
stateHolder.saveState(viewRoot.getViewId(), id, new Object[] {
treeStructure, state });
serializedView = new SerializedView(id, null);
@@ -323,9 +323,9 @@
* @return
*/
@SuppressWarnings("deprecation")
- protected Object restoreLogicalViewId(FacesContext context, String viewId,
+ protected String restoreLogicalViewId(FacesContext context, String viewId,
String renderKitId) {
- Object id = getRenderKit(context, renderKitId)
+ String id = (String) getRenderKit(context, renderKitId)
.getResponseStateManager().getTreeStructureToRestore(context,
viewId);
if (null != id) {
@@ -340,19 +340,32 @@
* @param context
* @return
*/
- protected Object getLogicalViewId(FacesContext context) {
+ protected String getLogicalViewId(FacesContext context) {
AjaxContext ajaxContext = AjaxContext.getCurrentInstance(context);
+ ExternalContext externalContext = context.getExternalContext();
if (ajaxContext.isAjaxRequest()) {
- Object id = context.getExternalContext().getRequestMap().get(
+ Object id = externalContext.getRequestMap().get(
VIEW_SEQUENCE);
if (null != id) {
- return id;
+ return id.toString();
}
}
- synchronized (viewSequenceMutex) {
+ // Store sequence in session, to avoyd claster configuration problem
+ // see https://javaserverfaces.dev.java.net/issues/show_bug.cgi?id=662
+ Object session = externalContext.getSession(true);
+ int viewSequence;
+ synchronized (session) {
+ Map<String, Object> sessionMap = externalContext.getSessionMap();
+ Integer sequence = (Integer) sessionMap.get(VIEW_SEQUENCE_ATTRIBUTE);
+ if(null != sequence){
+ viewSequence = sequence.intValue();
+ } else {
+ viewSequence = 0;
+ }
if (viewSequence++ == Character.MAX_VALUE) {
viewSequence = 0;
}
+ sessionMap.put(VIEW_SEQUENCE_ATTRIBUTE, new Integer(viewSequence));
}
return UIViewRoot.UNIQUE_ID_PREFIX + ((int) viewSequence);
}
Modified: trunk/framework/test/src/test/java/org/ajax4jsf/application/AjaxStateHolderTest.java
===================================================================
--- trunk/framework/test/src/test/java/org/ajax4jsf/application/AjaxStateHolderTest.java 2008-04-28 21:02:55 UTC (rev 8269)
+++ trunk/framework/test/src/test/java/org/ajax4jsf/application/AjaxStateHolderTest.java 2008-04-28 22:19:49 UTC (rev 8270)
@@ -43,7 +43,7 @@
}
/**
- * Test method for {@link org.ajax4jsf.application.AjaxStateHolder#getState(java.lang.String, java.lang.Object)}.
+ * Test method for {@link org.ajax4jsf.application.AjaxStateHolder#getState(java.lang.String, String)}.
*/
public void testGetState() {
Object state = new Object();
Modified: trunk/ui/dataTable/src/main/java/org/richfaces/component/UIDataGrid.java
===================================================================
--- trunk/ui/dataTable/src/main/java/org/richfaces/component/UIDataGrid.java 2008-04-28 21:02:55 UTC (rev 8269)
+++ trunk/ui/dataTable/src/main/java/org/richfaces/component/UIDataGrid.java 2008-04-28 22:19:49 UTC (rev 8270)
@@ -60,7 +60,6 @@
* @see org.ajax4jsf.ajax.repeat.UIDataAdaptor#dataChildren()
*/
protected Iterator<UIComponent> dataChildren() {
- // TODO Auto-generated method stub
return getChildren().iterator();
}
@@ -68,7 +67,6 @@
* @see org.ajax4jsf.ajax.repeat.UIDataAdaptor#fixedChildren()
*/
protected Iterator<UIComponent> fixedChildren() {
- // TODO Auto-generated method stub
return getFacets().values().iterator();
}
16 years, 8 months
JBoss Rich Faces SVN: r8269 - in trunk/framework/impl/src/main/java/org/ajax4jsf: resource and 1 other directory.
by richfaces-svn-commits＠lists.jboss.org
Author: alexsmirnov
Date: 2008-04-28 17:02:55 -0400 (Mon, 28 Apr 2008)
New Revision: 8269
Modified:
trunk/framework/impl/src/main/java/org/ajax4jsf/component/UIDataAdaptor.java
trunk/framework/impl/src/main/java/org/ajax4jsf/resource/ResourceLifecycle.java
Log:
fix http://jira.jboss.com/jira/browse/RF-2076.
Decrease logging level for an resources lifecycle.
Modified: trunk/framework/impl/src/main/java/org/ajax4jsf/component/UIDataAdaptor.java
===================================================================
--- trunk/framework/impl/src/main/java/org/ajax4jsf/component/UIDataAdaptor.java 2008-04-28 19:24:33 UTC (rev 8268)
+++ trunk/framework/impl/src/main/java/org/ajax4jsf/component/UIDataAdaptor.java 2008-04-28 21:02:55 UTC (rev 8269)
@@ -993,20 +993,24 @@
* @return
*/
private boolean keepSaved(FacesContext context) {
+ // For an any validation errors, children components state should be preserved
+ FacesMessage.Severity sev = context.getMaximumSeverity();
+ return (sev != null && (FacesMessage.SEVERITY_ERROR.compareTo(sev) >= 0));
- Iterator<String> clientIds = this.getChildState(context).keySet().iterator();
- while (clientIds.hasNext()) {
- String clientId = clientIds.next();
- Iterator<FacesMessage> messages = context.getMessages(clientId);
- while (messages.hasNext()) {
- FacesMessage message = messages.next();
- if (message.getSeverity()
- .compareTo(FacesMessage.SEVERITY_ERROR) >= 0) {
- return (true);
- }
- }
- }
- return false;
+
+// Iterator<String> clientIds = this.getChildState(context).keySet().iterator();
+// while (clientIds.hasNext()) {
+// String clientId = clientIds.next();
+// Iterator<FacesMessage> messages = context.getMessages(clientId);
+// while (messages.hasNext()) {
+// FacesMessage message = messages.next();
+// if (message.getSeverity()
+// .compareTo(FacesMessage.SEVERITY_ERROR) >= 0) {
+// return (true);
+// }
+// }
+// }
+// return false;
}
/**
@@ -1182,7 +1186,7 @@
public void encodeBegin(FacesContext context) throws IOException {
resetDataModel();
- if (!keepSaved(context)) {
+ if (null != childState && !keepSaved(context)) {
childState.remove(getBaseClientId(context));
}
// Mark component as used, if parent UIData change own range states not
Modified: trunk/framework/impl/src/main/java/org/ajax4jsf/resource/ResourceLifecycle.java
===================================================================
--- trunk/framework/impl/src/main/java/org/ajax4jsf/resource/ResourceLifecycle.java 2008-04-28 19:24:33 UTC (rev 8268)
+++ trunk/framework/impl/src/main/java/org/ajax4jsf/resource/ResourceLifecycle.java 2008-04-28 21:02:55 UTC (rev 8269)
@@ -202,7 +202,7 @@
}
} catch (Exception e) {
_log
- .error("Exception in PhaseListener, phase :"
+ .debug("Exception in PhaseListener, phase :"
+ phaseEvent.getPhaseId().toString()
+ (beforePhase ? " : beforePhase"
: " : afterPhase"), e);
16 years, 8 months
JBoss Rich Faces SVN: r8268 - trunk/framework/impl/src/main/java/org/ajax4jsf/resource.
by richfaces-svn-commits＠lists.jboss.org
Author: alexsmirnov
Date: 2008-04-28 15:24:33 -0400 (Mon, 28 Apr 2008)
New Revision: 8268
Modified:
trunk/framework/impl/src/main/java/org/ajax4jsf/resource/InternetResourceBase.java
Log:
Fix http://jira.jboss.com/jira/browse/RF-3159
Modified: trunk/framework/impl/src/main/java/org/ajax4jsf/resource/InternetResourceBase.java
===================================================================
--- trunk/framework/impl/src/main/java/org/ajax4jsf/resource/InternetResourceBase.java 2008-04-28 19:13:32 UTC (rev 8267)
+++ trunk/framework/impl/src/main/java/org/ajax4jsf/resource/InternetResourceBase.java 2008-04-28 19:24:33 UTC (rev 8268)
@@ -386,16 +386,16 @@
}
// context.setHeader("Content-Type",getContentType());
context.setContentType(getContentType(context));
- if (!cached && getContentLength(context) > 0) {
- context.setIntHeader("Content-Length", getContentLength(context));
- } else {
- // context.setHeader("Transfer-Encoding", "chunked");
- }
Date lastModified = getLastModified(context);
if (lastModified != null) {
context.setDateHeader("Last-Modified", lastModified.getTime());
}
+ int contentLength = getContentLength(context);
if (cached) {
+ if (contentLength > 0) {
+ context.setIntHeader("Content-Length",
+ contentLength);
+ }
Date expired = getExpired(context);
if (expired != null) {
context.setDateHeader("Expires", expired.getTime());
@@ -406,6 +406,12 @@
+ (DEFAULT_EXPIRE / 1000));
}
} else {
+ if (contentLength > 0) {
+ context.setIntHeader("Content-Length",
+ contentLength);
+ } else {
+ context.setHeader("Transfer-Encoding", "chunked");
+ }
context.setHeader("Cache-control", "max-age=0, no-store, no-cache");
context.setHeader("Pragma", "no-cache");
context.setIntHeader("Expires", 0);
16 years, 8 months
JBoss Rich Faces SVN: r8267 - in trunk/ui/scrollableDataTable/src/main: resources/org/richfaces/renderkit/html/css and 1 other directory.
by richfaces-svn-commits＠lists.jboss.org
Author: konstantin.mishin
Date: 2008-04-28 15:13:32 -0400 (Mon, 28 Apr 2008)
New Revision: 8267
Modified:
trunk/ui/scrollableDataTable/src/main/javascript/ClientUI/controls/grid/Grid.js
trunk/ui/scrollableDataTable/src/main/javascript/ClientUI/controls/grid/GridHeader.js
trunk/ui/scrollableDataTable/src/main/resources/org/richfaces/renderkit/html/css/scrollable-data-table.xcss
Log:
RF-3264
Modified: trunk/ui/scrollableDataTable/src/main/javascript/ClientUI/controls/grid/Grid.js
===================================================================
--- trunk/ui/scrollableDataTable/src/main/javascript/ClientUI/controls/grid/Grid.js 2008-04-28 19:12:13 UTC (rev 8266)
+++ trunk/ui/scrollableDataTable/src/main/javascript/ClientUI/controls/grid/Grid.js 2008-04-28 19:13:32 UTC (rev 8267)
@@ -87,9 +87,11 @@
if (element.offsetHeight != height) {
element.setStyle({height: height + "px"});
}
+ this.getHeader().resetFakeColumnWidth();
if(this.layout) {
this.layout.updateLayout();
}
+ this.getHeader().setFakeColumnWidth();
if (element.offsetHeight != height) {
element.setStyle({height: height + "px"});
}
Modified: trunk/ui/scrollableDataTable/src/main/javascript/ClientUI/controls/grid/GridHeader.js
===================================================================
--- trunk/ui/scrollableDataTable/src/main/javascript/ClientUI/controls/grid/GridHeader.js 2008-04-28 19:12:13 UTC (rev 8266)
+++ trunk/ui/scrollableDataTable/src/main/javascript/ClientUI/controls/grid/GridHeader.js 2008-04-28 19:13:32 UTC (rev 8267)
@@ -246,7 +246,6 @@
this.headerFrozenRow.setHeight(height);
this.frozenSubstrate.setWidth(frozenContentWidth);
this.updateHeaders();
- this.setFakeColumnWidth();
},
getColumns: function() {
return this._columns;
@@ -392,14 +391,16 @@
if(width<=0) this.getColumns()[column].sep.hide();
},
+ resetFakeColumnWidth: function() {
+ this._columns.last().style.width = "0px";
+ },
+
setFakeColumnWidth: function() {
- var style = this._columns.last().style;
- style.width = "0px";
- var width = this.grid.getElement().offsetWidth - this.headerRow.getElement().offsetWidth;
+ var width = this.grid.getBody().container.element.clientWidth - this.headerFrozenRow.getElement().offsetWidth - this.headerRow.getElement().offsetWidth;
if (width < 0) {
width = 0;
}
- style.width = width + "px";
+ this._columns.last().style.width = width + "px";
},
hideColumn: function(index, frozen) {
Modified: trunk/ui/scrollableDataTable/src/main/resources/org/richfaces/renderkit/html/css/scrollable-data-table.xcss
===================================================================
--- trunk/ui/scrollableDataTable/src/main/resources/org/richfaces/renderkit/html/css/scrollable-data-table.xcss 2008-04-28 19:12:13 UTC (rev 8266)
+++ trunk/ui/scrollableDataTable/src/main/resources/org/richfaces/renderkit/html/css/scrollable-data-table.xcss 2008-04-28 19:13:32 UTC (rev 8267)
@@ -67,7 +67,7 @@
background-position: center;
background-repeat: repeat-y;
cursor: e-resize;
- font-size: 1px;
+ font-size: 20px;
top: 0px;
width: 6px;
height: 100%;
16 years, 8 months
JBoss Rich Faces SVN: r8266 - trunk/test-applications/jsp/src/main/webapp/Tree.
by richfaces-svn-commits＠lists.jboss.org
Author: ayanul
Date: 2008-04-28 15:12:13 -0400 (Mon, 28 Apr 2008)
New Revision: 8266
Modified:
trunk/test-applications/jsp/src/main/webapp/Tree/Tree.jsp
Log:
Modified: trunk/test-applications/jsp/src/main/webapp/Tree/Tree.jsp
===================================================================
--- trunk/test-applications/jsp/src/main/webapp/Tree/Tree.jsp 2008-04-28 19:06:55 UTC (rev 8265)
+++ trunk/test-applications/jsp/src/main/webapp/Tree/Tree.jsp 2008-04-28 19:12:13 UTC (rev 8266)
@@ -13,10 +13,9 @@
nodeSelectListener="#{bean.onSelect}" binding="#{bean.tree}" onselected="window.status='selectedNode: '+event.selectedNode;"
onexpand="window.status='expandedNode: '+event.expandedNode" oncollapse="window.status='collapsedNode: '+ event.collapsedNode"
ajaxSubmitSelection="true" reRender="outputText, selectOneListbox" preserveModel="none" dragIndicator="treeIndicator"
- immediate="false" acceptedTypes="file1" dragType="#{bean.dragOn ? 'file1' : ''}" iconCollapsed="#{bean.iconCollapsed}"
- iconExpanded="#{bean.iconExpanded}" iconLeaf="#{bean.iconLeaf}" icon="#{bean.icon}" dropListener="#{bean.processDrop}"
+ immediate="false" acceptedTypes="file1" dragType="#{bean.dragOn ? 'file1' : ''}" icon="#{bean.icon}" dropListener="#{bean.processDrop}"
onclick="#{event.onclick}" ondblclick="#{event.ondblclick}" ondragend="#{event.ondragend}" ondragenter="#{event.ondragenter}" ondragexit="#{event.ondragexit}" ondragstart="#{event.ondragstart}" ondrop="#{event.ondrop}" ondropend="#{event.ondropend}" onkeydown="#{event.onkeydown}" onkeypress="#{event.onkeypress}" onkeyup="#{event.onkeyup}" onmousedown="#{event.onmousedown}" onmousemove="#{event.onmousemove}" onmouseout="#{event.onmouseout}" onmouseover="#{event.onmouseover}" onmouseup="#{event.onmouseup}" onbeforedomupdate="#{event.onbeforedomupdate}" oncomplete="#{event.oncomplete}" ondropout="#{event.ondropout}" ondropover="#{event.ondropover}">
-
+ <!--
<f:facet name="icon">
<h:outputText value="icon" rendered="#{bean.renderFacets}" />
</f:facet>
@@ -29,7 +28,7 @@
<f:facet name="iconCollapsed">
<h:outputText value="collapsed" rendered="#{bean.renderFacets}" />
</f:facet>
-
+ -->
<rich:dndParam name="treeParam" value="Tree Parameter" />
<rich:dndParam name="accept" value="accept" />
16 years, 8 months
JBoss Rich Faces SVN: r8265 - trunk/ui/dataTable/src/main/java/org/richfaces/renderkit.
by richfaces-svn-commits＠lists.jboss.org
Author: alexsmirnov
Date: 2008-04-28 15:06:55 -0400 (Mon, 28 Apr 2008)
New Revision: 8265
Modified:
trunk/ui/dataTable/src/main/java/org/richfaces/renderkit/AbstractTableRenderer.java
Log:
fix http://jira.jboss.com/jira/browse/RF-3277
Modified: trunk/ui/dataTable/src/main/java/org/richfaces/renderkit/AbstractTableRenderer.java
===================================================================
--- trunk/ui/dataTable/src/main/java/org/richfaces/renderkit/AbstractTableRenderer.java 2008-04-28 18:50:59 UTC (rev 8264)
+++ trunk/ui/dataTable/src/main/java/org/richfaces/renderkit/AbstractTableRenderer.java 2008-04-28 19:06:55 UTC (rev 8265)
@@ -500,6 +500,7 @@
}
UIInput filterValueInput = (UIInput)child.getFacet(FILTER_INPUT_FACET_NAME);
if (null != filterValueInput) {
+ filterValueInput.setId(filterValueInput.getId());
filterValueInput.decode(context);
Object submittedValue = filterValueInput.getSubmittedValue();
if (null != submittedValue) {
16 years, 8 months
JBoss Rich Faces SVN: r8264 - trunk/test-applications/facelets/src/main/webapp/ModalPanel.
by richfaces-svn-commits＠lists.jboss.org
Author: mvitenkov
Date: 2008-04-28 14:50:59 -0400 (Mon, 28 Apr 2008)
New Revision: 8264
Modified:
trunk/test-applications/facelets/src/main/webapp/ModalPanel/ModalPanel.xhtml
Log:
+applet inside modalPanel
Modified: trunk/test-applications/facelets/src/main/webapp/ModalPanel/ModalPanel.xhtml
===================================================================
--- trunk/test-applications/facelets/src/main/webapp/ModalPanel/ModalPanel.xhtml 2008-04-28 18:35:02 UTC (rev 8263)
+++ trunk/test-applications/facelets/src/main/webapp/ModalPanel/ModalPanel.xhtml 2008-04-28 18:50:59 UTC (rev 8264)
@@ -1,25 +1,56 @@
<!-- %@ taglib uri="http://java.sun.com/jstl/core" prefix="c"%-->
-<f:subview xmlns:ui="http://java.sun.com/jsf/facelets" xmlns:f="http://java.sun.com/jsf/core" xmlns:a4j="http://richfaces.org/a4j" xmlns:h="http://java.sun.com/jsf/html" xmlns:rich="http://richfaces.org/rich" id="modalPanelSubviewID">
+<f:subview xmlns:ui="http://java.sun.com/jsf/facelets"
+ xmlns:f="http://java.sun.com/jsf/core"
+ xmlns:a4j="http://richfaces.org/a4j"
+ xmlns:h="http://java.sun.com/jsf/html"
+ xmlns:rich="http://richfaces.org/rich" id="modalPanelSubviewID">
- <h:selectOneMenu value="#{richBean.srcContainer}" onchange="submit();">
+ <h:selectOneMenu value="#{richBean.srcContainer}" onchange="submit();">
<f:selectItems value="#{richBean.listContainer}" />
</h:selectOneMenu>
- <rich:modalPanel id="modalPanelID" minHeight="#{modalPanel.minHeight}" minWidth="#{modalPanel.minWidth}"
- height="#{modalPanel.height}" width="#{modalPanel.width}" moveable="#{modalPanel.moveable}"
- resizeable="#{modalPanel.resizeable}" keepVisualState="#{modalPanel.keepVisualState}" rendered="#{modalPanel.rendered}"
- zindex="#{modalPanel.zindex}" autosized="#{modalPanel.autosized}" shadowDepth="#{modalPanel.shadowDepth}"
- shadowOpacity="#{modalPanel.shadowOpacity}" showWhenRendered="#{modalPanel.showWhenRendered}"
- onhide="#{event.onhide}" onmaskclick="#{event.onmaskclick}" onmaskcontextmenu="#{event.onmaskcontextmenu}" onmaskdblclick="#{event.onmaskdblclick}" onmaskmousedown="#{event.onmaskmousedown}" onmaskmousemove="#{event.onmaskmousemove}" onmaskmouseout="#{event.onmaskmouseout}" onmaskmouseover="#{event.onmaskmouseover}" onmaskmouseup="#{event.onmaskmouseup}" onmove="#{event.onmove}" onresize="#{event.onresize}" onshow="#{event.onshow}">
+ <rich:modalPanel id="modalPanelID" minHeight="#{modalPanel.minHeight}"
+ minWidth="#{modalPanel.minWidth}" height="#{modalPanel.height}"
+ width="#{modalPanel.width}" moveable="#{modalPanel.moveable}"
+ resizeable="#{modalPanel.resizeable}"
+ keepVisualState="#{modalPanel.keepVisualState}"
+ rendered="#{modalPanel.rendered}" zindex="#{modalPanel.zindex}"
+ autosized="#{modalPanel.autosized}"
+ shadowDepth="#{modalPanel.shadowDepth}"
+ shadowOpacity="#{modalPanel.shadowOpacity}"
+ showWhenRendered="#{modalPanel.showWhenRendered}"
+ onhide="#{event.onhide}" onmaskclick="#{event.onmaskclick}"
+ onmaskcontextmenu="#{event.onmaskcontextmenu}"
+ onmaskdblclick="#{event.onmaskdblclick}"
+ onmaskmousedown="#{event.onmaskmousedown}"
+ onmaskmousemove="#{event.onmaskmousemove}"
+ onmaskmouseout="#{event.onmaskmouseout}"
+ onmaskmouseover="#{event.onmaskmouseover}"
+ onmaskmouseup="#{event.onmaskmouseup}" onmove="#{event.onmove}"
+ onresize="#{event.onresize}" onshow="#{event.onshow}">
<f:facet name="header">
<h:outputText value="Heder goes here..." />
</f:facet>
<f:facet name="controls">
- <h:graphicImage value="/pics/error.gif" onclick="Richfaces.hideModalPanel('modalPanelID');return false;" />
+ <h:graphicImage value="/pics/error.gif"
+ onclick="Richfaces.hideModalPanel('modalPanelID');return false;" />
+ <h:form>
+ <a4j:commandLink action="#"
+ oncomplete="Richfaces.hideModalPanel('modalPanelID')" value="close" />
+ </h:form>
</f:facet>
<h:outputText value="This is Modal Panel example" styleClass="text1" />
<h:inputText value="#{modalPanel.inputTextTest}" />
+
+ <applet code="ArcTest.class" width="400" height="400"
+
+ codebase="http://java.sun.com/applets/jdk/1.4/demo/applets/ArcTest/"
+
+ alt="Your browser understands the <APPLET> tag but isn't running the applet, for some reason.">
+
+ Your browser is completely ignoring the <APPLET> tag!
+ </applet>
<h:selectOneListbox value="#{modalPanel.selectOneListboxTest}">
<f:selectItem itemLabel="1" itemValue="1" />
<f:selectItem itemLabel="2" itemValue="2" />
@@ -30,33 +61,40 @@
<br />
<br />
</f:verbatim>
-
- <h:outputLink value="http://www.jboss.com/"><f:verbatim>Link</f:verbatim></h:outputLink>
-
+
+ <h:outputLink value="http://www.jboss.com/">
+ <f:verbatim>Link</f:verbatim>
+ </h:outputLink>
+
<f:verbatim>
<br />
<br />
</f:verbatim>
-
- <h:outputLink onclick="Richfaces.hideModalPanel('modalPanelID');return false;" value="Close">
+
+ <h:outputLink
+ onclick="Richfaces.hideModalPanel('modalPanelID');return false;"
+ value="Close">
<f:verbatim>Close</f:verbatim>
</h:outputLink>
<ui:include src="${richBean.pathComponentContainer}" />
</rich:modalPanel>
- <a onclick="Richfaces.showModalPanel('modalPanelID');" href="#">Show MP</a>
+ <a onclick="Richfaces.showModalPanel('modalPanelID');" href="#">Show
+ MP</a>
<f:verbatim>
<br />
<br />
</f:verbatim>
- <h:graphicImage value="/pics/info.gif" onclick="Richfaces.showModalPanel('modalPanelID');" />
+ <h:graphicImage value="/pics/info.gif"
+ onclick="Richfaces.showModalPanel('modalPanelID');" />
<f:verbatim>
<br />
<br />
</f:verbatim>
- <div style="position: relative; font-size: 50px; z-index: 2; color: navy">z-index</div>
+ <div
+ style="position: relative; font-size: 50px; z-index: 2; color: navy">z-index</div>
</f:subview>
16 years, 8 months
JBoss Rich Faces SVN: r8263 - trunk/test-applications/facelets/src/main/webapp/ModalPanel.
by richfaces-svn-commits＠lists.jboss.org
Author: mvitenkov
Date: 2008-04-28 14:35:02 -0400 (Mon, 28 Apr 2008)
New Revision: 8263
Modified:
trunk/test-applications/facelets/src/main/webapp/ModalPanel/ModalPanelProperty.xhtml
Log:
remove a4j:support for reRender attribute.
Modified: trunk/test-applications/facelets/src/main/webapp/ModalPanel/ModalPanelProperty.xhtml
===================================================================
--- trunk/test-applications/facelets/src/main/webapp/ModalPanel/ModalPanelProperty.xhtml 2008-04-28 18:33:52 UTC (rev 8262)
+++ trunk/test-applications/facelets/src/main/webapp/ModalPanel/ModalPanelProperty.xhtml 2008-04-28 18:35:02 UTC (rev 8263)
@@ -27,8 +27,7 @@
</h:inputText>
<h:outputText value="rendered" />
- <h:selectBooleanCheckbox value="#{modalPanel.rendered}" >
- <a4j:support event="onchange" reRender="modalPanelID"></a4j:support>
+ <h:selectBooleanCheckbox value="#{modalPanel.rendered}" onchange="submit();">
</h:selectBooleanCheckbox>
<h:outputText value="showWhenRendered" />
@@ -75,5 +74,8 @@
<h:selectBooleanCheckbox value="#{modalPanel.moveable}">
<a4j:support event="onclick" reRender="modalPanelID"></a4j:support>
</h:selectBooleanCheckbox>
+
+ <a4j:commandLink onclick="$('formID:ModalPanelPropertySubviewID:modalPanelID').component.show(event)" value="show"></a4j:commandLink>
+ <a4j:commandLink onclick="$('formID:ModalPanelPropertySubviewID:modalPanelID').component.hide(event)" value="hide"></a4j:commandLink>
</h:panelGrid>
</f:subview>
\ No newline at end of file
16 years, 8 months