5:23 a.m.
Author: ayanul
Date: 2008-04-29 06:23:35 -0400 (Tue, 29 Apr 2008)
New Revision: 8276
Modified:
trunk/test-applications/jsp/src/main/java/rich/Options.java
trunk/test-applications/jsp/src/main/java/tree/Bean.java
trunk/test-applications/jsp/src/main/webapp/pages/Rich/Rich.jsp
trunk/test-applications/jsp/src/main/webapp/pages/RichMenu/RichMenu.jsp
Log:
+fix tree
+add a4j:log
Modified: trunk/test-applications/jsp/src/main/java/rich/Options.java
===================================================================
--- trunk/test-applications/jsp/src/main/java/rich/Options.java 2008-04-29 10:22:00 UTC
(rev 8275)
+++ trunk/test-applications/jsp/src/main/java/rich/Options.java 2008-04-29 10:23:35 UTC
(rev 8276)
@@ -25,14 +25,14 @@
private static String [] INPUTNUMBERSLIDER_EVENT = {"onblur",
"onchange", "onclick", "ondblclick", "onerror",
"onfocus", "onkeydown", "onkeypress", "onkeyup",
"onmousedown", "onmousemove", "onmouseout",
"onmouseover", "onmouseup", "onselect",
"onslide"};
private static String [] INPUTNUMBERSLIDER_STYLE = {"barClass",
"barStyle", "handleClass", "inputClass",
"handleSelectedClass", "inputSize", "styleClass",
"inputStyle", "tipStyle", "style", "tipClass"};
- private boolean consol;
+ private boolean log;
private boolean reDefault;
private boolean reComponent;
private boolean reProperty;
private boolean reStraightforward;
public Options() {
-
+ log = false;
reDefault = true;
reComponent = true;
reProperty = true;
@@ -66,11 +66,17 @@
this.reDefault = reDefault;
}
- public boolean isConsol() {
- return consol;
+ /**
+ * @return the log
+ */
+ public boolean isLog() {
+ return log;
}
- public void setConsol(boolean consol) {
- this.consol = consol;
+ /**
+ * @param log the log to set
+ */
+ public void setLog(boolean log) {
+ this.log = log;
}
}
Modified: trunk/test-applications/jsp/src/main/java/tree/Bean.java
===================================================================
--- trunk/test-applications/jsp/src/main/java/tree/Bean.java 2008-04-29 10:22:00 UTC (rev
8275)
+++ trunk/test-applications/jsp/src/main/java/tree/Bean.java 2008-04-29 10:23:35 UTC (rev
8276)
@@ -108,17 +108,18 @@
}
public void changeIcons(javax.faces.event.ActionEvent event) {
- if (null == icon) {
+
+ if ("".equals(icon)) {
iconCollapsed = "/pics/header.png";
iconExpanded = "/pics/item.png";
iconLeaf = "/pics/ajax_process.gif";
icon = "/pics/ajax_stoped.gif";
commandButtonCaption = "Set defoult icons";
} else {
- iconCollapsed = null;
- iconExpanded = null;
- iconLeaf = null;
- icon = null;
+ iconCollapsed = "";
+ iconExpanded = "";
+ iconLeaf = "";
+ icon = "";
commandButtonCaption = "Set user icons";
}
}
@@ -169,11 +170,6 @@
UITree tree = getTree(event);
TreeRowKey key = (TreeRowKey) tree.getRowKey();
- Set keys = tree.getAjaxKeys();
- if (keys == null) {
- keys = new HashSet();
- tree.setAjaxKeys(keys);
- }
AjaxContext ajaxCtx = AjaxContext.getCurrentInstance();
FacesContext fctx = FacesContext.getCurrentInstance();
@@ -181,7 +177,7 @@
// Force more than one node to update here:
for (int i = 0; i < 5; i++) {
ListRowKey dirtyKey = new ListRowKey(Integer.toString(i));
- keys.add(dirtyKey);
+ tree.addRequestKey(dirtyKey);
tree.setRowKey(dirtyKey);
ajaxCtx.addComponentToAjaxRender(tree.getParent(), tree.getClientId(fctx));
}
@@ -334,4 +330,5 @@
public void setRenderFacets(boolean renderFacets) {
this.renderFacets = renderFacets;
}
+
}
Modified: trunk/test-applications/jsp/src/main/webapp/pages/Rich/Rich.jsp
===================================================================
--- trunk/test-applications/jsp/src/main/webapp/pages/Rich/Rich.jsp 2008-04-29 10:22:00
UTC (rev 8275)
+++ trunk/test-applications/jsp/src/main/webapp/pages/Rich/Rich.jsp 2008-04-29 10:23:35
UTC (rev 8276)
@@ -35,7 +35,7 @@
<h:column rendered="#{option.reComponent}">
<jsp:include page="${richBean.pathComponent}"/>
</h:column>
-
+ <a4j:log popup="false"
rendered="#{option.log}"></a4j:log>
<h:column rendered="#{option.reStraightforward}">
<jsp:include page="${richBean.pathStraightforward}"/>
</h:column>
Modified: trunk/test-applications/jsp/src/main/webapp/pages/RichMenu/RichMenu.jsp
===================================================================
--- trunk/test-applications/jsp/src/main/webapp/pages/RichMenu/RichMenu.jsp 2008-04-29
10:22:00 UTC (rev 8275)
+++ trunk/test-applications/jsp/src/main/webapp/pages/RichMenu/RichMenu.jsp 2008-04-29
10:23:35 UTC (rev 8276)
@@ -7,7 +7,7 @@
<h:panelGrid columns="6" border="1">
<h:panelGrid columns="2">
<h:outputText value="a4j:log"></h:outputText>
- <h:selectBooleanCheckbox value="#{option.consol}"
onchange="submit();"></h:selectBooleanCheckbox>
+ <h:selectBooleanCheckbox value="#{option.log}"
onchange="submit();"></h:selectBooleanCheckbox>
</h:panelGrid>
<h:panelGrid columns="2">
<h:outputText value="h" />
@@ -18,7 +18,7 @@
<a4j:commandButton value="immediate" immediate="true"
reRender="richGridID" style="width : 85px; height :
21px;"></a4j:commandButton>
</h:panelGrid>
<h:panelGrid columns="1">
- <a4j:status startText="WORK!" startStyle="color: red;"
stopText="a4j:status"></a4j:status>
+ <a4j:status id="a4jStatusID" startText="WORK!"
startStyle="color: red;" stopText="a4j:status"></a4j:status>
</h:panelGrid>
<h:panelGrid columns="1">
<h:panelGrid columns="4">