JBoss Rich Faces SVN: r10865 - trunk/test-applications/regressionArea/Seam-ear.
by richfaces-svn-commits＠lists.jboss.org
Author: andrei_exadel
Date: 2008-10-22 10:15:36 -0400 (Wed, 22 Oct 2008)
New Revision: 10865
Modified:
trunk/test-applications/regressionArea/Seam-ear/pom.xml
Log:
Change jboss-seam.jar from EJB to JAR dependency
Modified: trunk/test-applications/regressionArea/Seam-ear/pom.xml
===================================================================
--- trunk/test-applications/regressionArea/Seam-ear/pom.xml 2008-10-22 13:30:59 UTC (rev 10864)
+++ trunk/test-applications/regressionArea/Seam-ear/pom.xml 2008-10-22 14:15:36 UTC (rev 10865)
@@ -25,7 +25,7 @@
<groupId>org.jboss.seam</groupId>
<artifactId>jboss-seam</artifactId>
<version>${seamversion}</version>
- <type>ejb</type>
+ <type>jar</type>
<exclusions>
<exclusion>
<artifactId>el-api</artifactId>
17 years, 2 months
JBoss Rich Faces SVN: r10864 - in trunk/test-applications/jsp/src/main/java/util: parser and 1 other directory.
by richfaces-svn-commits＠lists.jboss.org
Author: mvitenkov
Date: 2008-10-22 09:30:59 -0400 (Wed, 22 Oct 2008)
New Revision: 10864
Modified:
trunk/test-applications/jsp/src/main/java/util/componentInfo/ComponentInfo.java
trunk/test-applications/jsp/src/main/java/util/parser/TLDParser.java
Log:
Modified: trunk/test-applications/jsp/src/main/java/util/componentInfo/ComponentInfo.java
===================================================================
--- trunk/test-applications/jsp/src/main/java/util/componentInfo/ComponentInfo.java 2008-10-22 11:49:30 UTC (rev 10863)
+++ trunk/test-applications/jsp/src/main/java/util/componentInfo/ComponentInfo.java 2008-10-22 13:30:59 UTC (rev 10864)
@@ -86,6 +86,9 @@
}
TLDParser parser = new TLDParser(richName);
ArrayList<String> allAttributes = parser.getAllAttributes();
+ for(String s:allAttributes){
+ System.out.println(s);
+ }
AccessibleObject.setAccessible(fields, true);
for (Field field : fields) {
Modified: trunk/test-applications/jsp/src/main/java/util/parser/TLDParser.java
===================================================================
--- trunk/test-applications/jsp/src/main/java/util/parser/TLDParser.java 2008-10-22 11:49:30 UTC (rev 10863)
+++ trunk/test-applications/jsp/src/main/java/util/parser/TLDParser.java 2008-10-22 13:30:59 UTC (rev 10864)
@@ -10,7 +10,7 @@
public class TLDParser {
- protected String component;
+ protected String component;
protected JarEntry tld;
protected JarFile richfacesUI;
protected ArrayList<String> allAttributes;
@@ -18,7 +18,7 @@
public TLDParser(String str) {
this.component = str;
allAttributes = new ArrayList<String>();
- }
+ }
public ArrayList<String> getAllAttributes() {
@@ -26,28 +26,39 @@
InputStream input = null;
try {
input = richfacesUI.getInputStream(tld);
-
- InputStreamReader isr = new InputStreamReader(input);
- BufferedReader reader = new BufferedReader(isr);
- String line, attribute;
- int position, end;
- while ((line = reader.readLine()) != null) {
- if ((position = line.indexOf("<name>")) != -1) {
+
+ InputStreamReader isr = new InputStreamReader(input);
+ BufferedReader reader = new BufferedReader(isr);
+ String line, attribute;
+ int position, end;
+ boolean flag = true;
+ while (((line = reader.readLine()) != null) && flag) {
+ if ((position = line.indexOf("<name>")) != -1) {
end = line.indexOf("</name>");
attribute = line.substring(position + 6, end).trim();
- allAttributes.add(attribute);
- }
- }
- reader.close();
- } catch (IOException e) {
+ if (attribute.equalsIgnoreCase(component)) {
+ while (!(line = reader.readLine()).contains("</tag>")) {
+ if ((position = line.indexOf("<name>")) != -1) {
+ end = line.indexOf("</name>");
+ attribute = line.substring(position + 6, end)
+ .trim();
+ allAttributes.add(attribute);
+ }
+ }
+ flag = false;
+ }
+ }
+ }
+ reader.close();
+ } catch (IOException e) {
e.printStackTrace();
}
return allAttributes;
}
- public String getExtPath() {
+ public String getExtPath() {
ClassLoader loader = Thread.currentThread().getContextClassLoader();
- String resource = "META-INF/richfaces.tld";
+ String resource = "META-INF/richfaces.tld";
return loader.getResource(resource).toString();
}
@@ -57,9 +68,9 @@
public void setComponent(String component) {
this.component = component;
- }
+ }
- public JarFile getRichfacesUI() {
+ public JarFile getRichfacesUI() {
String temp = null;
int position;
try {
@@ -67,7 +78,7 @@
temp = getExtPath().substring("jar:file:\\".length(), position);
}
richfacesUI = new JarFile(temp);
- } catch (IOException e) {
+ } catch (IOException e) {
e.printStackTrace();
}
return richfacesUI;
17 years, 2 months
JBoss Rich Faces SVN: r10863 - trunk/test-applications/jsp/src/main/java/util/parser.
by richfaces-svn-commits＠lists.jboss.org
Author: mvitenkov
Date: 2008-10-22 07:49:30 -0400 (Wed, 22 Oct 2008)
New Revision: 10863
Modified:
trunk/test-applications/jsp/src/main/java/util/parser/TLDParser.java
Log:
Modified: trunk/test-applications/jsp/src/main/java/util/parser/TLDParser.java
===================================================================
--- trunk/test-applications/jsp/src/main/java/util/parser/TLDParser.java 2008-10-22 11:48:13 UTC (rev 10862)
+++ trunk/test-applications/jsp/src/main/java/util/parser/TLDParser.java 2008-10-22 11:49:30 UTC (rev 10863)
@@ -1,12 +1,9 @@
package util.parser;
import java.io.BufferedReader;
-import java.io.File;
-import java.io.FileNotFoundException;
import java.io.IOException;
import java.io.InputStream;
import java.io.InputStreamReader;
-import java.io.RandomAccessFile;
import java.util.ArrayList;
import java.util.jar.JarEntry;
import java.util.jar.JarFile;
17 years, 2 months
JBoss Rich Faces SVN: r10862 - trunk/test-applications/jsp/src/main/java/util/componentInfo.
by richfaces-svn-commits＠lists.jboss.org
Author: mvitenkov
Date: 2008-10-22 07:48:13 -0400 (Wed, 22 Oct 2008)
New Revision: 10862
Modified:
trunk/test-applications/jsp/src/main/java/util/componentInfo/ComponentInfo.java
Log:
Correction with util.TLDParser
Modified: trunk/test-applications/jsp/src/main/java/util/componentInfo/ComponentInfo.java
===================================================================
--- trunk/test-applications/jsp/src/main/java/util/componentInfo/ComponentInfo.java 2008-10-22 11:47:37 UTC (rev 10861)
+++ trunk/test-applications/jsp/src/main/java/util/componentInfo/ComponentInfo.java 2008-10-22 11:48:13 UTC (rev 10862)
@@ -6,17 +6,16 @@
import java.lang.reflect.Method;
import java.lang.reflect.Modifier;
import java.util.ArrayList;
-import java.util.Iterator;
-import java.util.List;
-import java.util.Map;
-import java.util.Set;
-import java.util.Map.Entry;
import javax.el.ValueExpression;
import javax.faces.component.UIComponent;
import javax.faces.component.UIComponentBase;
import javax.faces.context.FacesContext;
+import org.richfaces.component.UICalendar;
+
+import util.parser.TLDParser;
+
public class ComponentInfo {
private static volatile ComponentInfo INSTANCE;
private ComponentAttribute componentAttribute = new ComponentAttribute();
@@ -69,23 +68,34 @@
public void addField(Object component) {
if (component == null)
return;
- this.component = component;
+ this.component = component;
- //if(ve.isLiteralText()) {ve.getExpressionString()} {ve.getValue(). }
-
componentAttribute.cleanAll();
String str = null;
Field[] fields = component.getClass().getDeclaredFields();
+
+ String richName = null;
+ if(component.getClass().getName().startsWith("org.richfaces.component.html.Html")){
+ richName = component.getClass().getName().substring("org.richfaces.component.html.Html".length()).toLowerCase();
+ } else {
+ try {
+ throw new Exception("Unknown class for component!!!");
+ } catch (Exception e) {
+ e.printStackTrace();
+ }
+ }
+ TLDParser parser = new TLDParser(richName);
+ ArrayList<String> allAttributes = parser.getAllAttributes();
+
AccessibleObject.setAccessible(fields, true);
for (Field field : fields) {
- if (!Modifier.isStatic(field.getModifiers())) {
- str = field.getName().substring(1);
+ str = field.getName().substring(1);
+ if (!Modifier.isStatic(field.getModifiers()) && (allAttributes.contains(str))) {
if (str.startsWith("on")) {
componentAttribute.putEvent(str,
"");
} else if (str.indexOf("tyle") != -1 || str.indexOf("lass") != -1) {
- try {
- //Object obj = field.get(component);
+ try {
UIComponentBase comp = (UIComponentBase) component;
ValueExpression ve = comp.getValueExpression(str);
if(ve != null){
@@ -96,15 +106,14 @@
}
} else componentAttribute.putStyle(str, "null");
- } catch (IllegalArgumentException e) {
- // TODO Auto-generated catch block
+ } catch (IllegalArgumentException e) {
e.printStackTrace();
}
} else {
try {
- Class cl = field.getType();
+ Class cl = field.getType();
if(cl.isPrimitive() || cl.getName().equals("java.lang.String")){
UIComponentBase comp = (UIComponentBase) component;
ValueExpression ve = comp.getValueExpression(str);
@@ -115,8 +124,6 @@
componentAttribute.putAttribute(str, ve.getValue(FacesContext.getCurrentInstance().getELContext()).toString());
}
}else componentAttribute.putAttribute(str, "null");
-// Object obj = field.get(component);
-// componentAttribute.putAttribute(str, obj == null ? "null" : obj.toString());
} else componentAttribute.putAttribute(str, "---");
} catch (IllegalArgumentException e) {
e.printStackTrace();
@@ -127,7 +134,7 @@
}
- public static String toString(Object obj) {
+ public static String toString(Object obj) {
Class cl = obj.getClass();
String r = cl.getName() + "[";
Class sc = cl.getSuperclass();
17 years, 2 months
JBoss Rich Faces SVN: r10861 - in trunk/test-applications/jsp/src/main/java/util: parser and 1 other directory.
by richfaces-svn-commits＠lists.jboss.org
Author: mvitenkov
Date: 2008-10-22 07:47:37 -0400 (Wed, 22 Oct 2008)
New Revision: 10861
Added:
trunk/test-applications/jsp/src/main/java/util/parser/
trunk/test-applications/jsp/src/main/java/util/parser/TLDParser.java
Log:
TLDParser for getting all attributes from richfaces.tld
Added: trunk/test-applications/jsp/src/main/java/util/parser/TLDParser.java
===================================================================
--- trunk/test-applications/jsp/src/main/java/util/parser/TLDParser.java (rev 0)
+++ trunk/test-applications/jsp/src/main/java/util/parser/TLDParser.java 2008-10-22 11:47:37 UTC (rev 10861)
@@ -0,0 +1,78 @@
+package util.parser;
+
+import java.io.BufferedReader;
+import java.io.File;
+import java.io.FileNotFoundException;
+import java.io.IOException;
+import java.io.InputStream;
+import java.io.InputStreamReader;
+import java.io.RandomAccessFile;
+import java.util.ArrayList;
+import java.util.jar.JarEntry;
+import java.util.jar.JarFile;
+
+public class TLDParser {
+
+ protected String component;
+ protected JarEntry tld;
+ protected JarFile richfacesUI;
+ protected ArrayList<String> allAttributes;
+
+ public TLDParser(String str) {
+ this.component = str;
+ allAttributes = new ArrayList<String>();
+ }
+
+ public ArrayList<String> getAllAttributes() {
+
+ tld = getRichfacesUI().getJarEntry("META-INF/richfaces.tld");
+ InputStream input = null;
+ try {
+ input = richfacesUI.getInputStream(tld);
+
+ InputStreamReader isr = new InputStreamReader(input);
+ BufferedReader reader = new BufferedReader(isr);
+ String line, attribute;
+ int position, end;
+ while ((line = reader.readLine()) != null) {
+ if ((position = line.indexOf("<name>")) != -1) {
+ end = line.indexOf("</name>");
+ attribute = line.substring(position + 6, end).trim();
+ allAttributes.add(attribute);
+ }
+ }
+ reader.close();
+ } catch (IOException e) {
+ e.printStackTrace();
+ }
+ return allAttributes;
+ }
+
+ public String getExtPath() {
+ ClassLoader loader = Thread.currentThread().getContextClassLoader();
+ String resource = "META-INF/richfaces.tld";
+ return loader.getResource(resource).toString();
+ }
+
+ public String getComponent() {
+ return component;
+ }
+
+ public void setComponent(String component) {
+ this.component = component;
+ }
+
+ public JarFile getRichfacesUI() {
+ String temp = null;
+ int position;
+ try {
+ if ((position = getExtPath().indexOf('!')) != -1) {
+ temp = getExtPath().substring("jar:file:\\".length(), position);
+ }
+ richfacesUI = new JarFile(temp);
+ } catch (IOException e) {
+ e.printStackTrace();
+ }
+ return richfacesUI;
+ }
+}
17 years, 2 months
JBoss Rich Faces SVN: r10860 - trunk/ui/columns/src/main/java/org/richfaces/taglib.
by richfaces-svn-commits＠lists.jboss.org
Author: andrei_exadel
Date: 2008-10-22 05:55:39 -0400 (Wed, 22 Oct 2008)
New Revision: 10860
Modified:
trunk/ui/columns/src/main/java/org/richfaces/taglib/IndexedValueExpression.java
Log:
License added
Modified: trunk/ui/columns/src/main/java/org/richfaces/taglib/IndexedValueExpression.java
===================================================================
--- trunk/ui/columns/src/main/java/org/richfaces/taglib/IndexedValueExpression.java 2008-10-22 09:53:04 UTC (rev 10859)
+++ trunk/ui/columns/src/main/java/org/richfaces/taglib/IndexedValueExpression.java 2008-10-22 09:55:39 UTC (rev 10860)
@@ -1,3 +1,25 @@
+/*
+ * The contents of this file are subject to the terms
+ * of the Common Development and Distribution License
+ * (the "License"). You may not use this file except
+ * in compliance with the License.
+ *
+ * You can obtain a copy of the license at
+ * glassfish/bootstrap/legal/CDDLv1.0.txt or
+ * https://glassfish.dev.java.net/public/CDDLv1.0.html.
+ * See the License for the specific language governing
+ * permissions and limitations under the License.
+ *
+ * When distributing Covered Code, include this CDDL
+ * HEADER in each file and include the License file at
+ * glassfish/bootstrap/legal/CDDLv1.0.txt. If applicable,
+ * add the following below this CDDL HEADER, with the
+ * fields enclosed by brackets "[]" replaced with your
+ * own identifying information: Portions Copyright [yyyy]
+ * [name of copyright owner]
+ *
+ * Copyright 2005 Sun Microsystems, Inc. All rights reserved.
+ */
package org.richfaces.taglib;
import javax.el.ELContext;
17 years, 2 months
JBoss Rich Faces SVN: r10859 - in trunk/ui/columns/src/main/java/org/richfaces: taglib and 1 other directory.
by richfaces-svn-commits＠lists.jboss.org
Author: andrei_exadel
Date: 2008-10-22 05:53:04 -0400 (Wed, 22 Oct 2008)
New Revision: 10859
Modified:
trunk/ui/columns/src/main/java/org/richfaces/iterator/ForEachIterator.java
trunk/ui/columns/src/main/java/org/richfaces/iterator/SimpleForEachIterator.java
trunk/ui/columns/src/main/java/org/richfaces/taglib/IndexedValueExpression.java
trunk/ui/columns/src/main/java/org/richfaces/taglib/IteratedExpression.java
trunk/ui/columns/src/main/java/org/richfaces/taglib/TypedCollections.java
Log:
Add license headers to stolen classes
Modified: trunk/ui/columns/src/main/java/org/richfaces/iterator/ForEachIterator.java
===================================================================
--- trunk/ui/columns/src/main/java/org/richfaces/iterator/ForEachIterator.java 2008-10-22 08:29:00 UTC (rev 10858)
+++ trunk/ui/columns/src/main/java/org/richfaces/iterator/ForEachIterator.java 2008-10-22 09:53:04 UTC (rev 10859)
@@ -1,9 +1,29 @@
/*
- * ForEachIterator.java Date created: 07.12.2007
- * Last modified by: $Author$
- * $Revision$ $Date$
- */
+ * The contents of this file are subject to the terms
+ * of the Common Development and Distribution License
+ * (the "License"). You may not use this file except
+ * in compliance with the License.
+ *
+ * You can obtain a copy of the license at
+ * glassfish/bootstrap/legal/CDDLv1.0.txt or
+ * https://glassfish.dev.java.net/public/CDDLv1.0.html.
+ * See the License for the specific language governing
+ * permissions and limitations under the License.
+ *
+ * When distributing Covered Code, include this CDDL
+ * HEADER in each file and include the License file at
+ * glassfish/bootstrap/legal/CDDLv1.0.txt. If applicable,
+ * add the following below this CDDL HEADER, with the
+ * fields enclosed by brackets "[]" replaced with your
+ * own identifying information: Portions Copyright [yyyy]
+ * [name of copyright owner]
+ *
+ * Copyright 2005 Sun Microsystems, Inc. All rights reserved.
+ *
+ * Portions Copyright Apache Software Foundation.
+ */
+
package org.richfaces.iterator;
import javax.servlet.jsp.JspTagException;
Modified: trunk/ui/columns/src/main/java/org/richfaces/iterator/SimpleForEachIterator.java
===================================================================
--- trunk/ui/columns/src/main/java/org/richfaces/iterator/SimpleForEachIterator.java 2008-10-22 08:29:00 UTC (rev 10858)
+++ trunk/ui/columns/src/main/java/org/richfaces/iterator/SimpleForEachIterator.java 2008-10-22 09:53:04 UTC (rev 10859)
@@ -1,8 +1,27 @@
/*
- * ForEachIterator.java Date created: 06.12.2007
- * Last modified by: $Author$
- * $Revision$ $Date$
- */
+ * The contents of this file are subject to the terms
+ * of the Common Development and Distribution License
+ * (the "License"). You may not use this file except
+ * in compliance with the License.
+ *
+ * You can obtain a copy of the license at
+ * glassfish/bootstrap/legal/CDDLv1.0.txt or
+ * https://glassfish.dev.java.net/public/CDDLv1.0.html.
+ * See the License for the specific language governing
+ * permissions and limitations under the License.
+ *
+ * When distributing Covered Code, include this CDDL
+ * HEADER in each file and include the License file at
+ * glassfish/bootstrap/legal/CDDLv1.0.txt. If applicable,
+ * add the following below this CDDL HEADER, with the
+ * fields enclosed by brackets "[]" replaced with your
+ * own identifying information: Portions Copyright [yyyy]
+ * [name of copyright owner]
+ *
+ * Copyright 2005 Sun Microsystems, Inc. All rights reserved.
+ *
+ * Portions Copyright Apache Software Foundation.
+ */
package org.richfaces.iterator;
@@ -19,7 +38,7 @@
/**
* TODO Class description goes here.
*
- * @author "Andrey Markavtsov"
+ * @author Shawn Bayern
*
*/
public class SimpleForEachIterator implements ForEachIterator, Serializable {
Modified: trunk/ui/columns/src/main/java/org/richfaces/taglib/IndexedValueExpression.java
===================================================================
--- trunk/ui/columns/src/main/java/org/richfaces/taglib/IndexedValueExpression.java 2008-10-22 08:29:00 UTC (rev 10858)
+++ trunk/ui/columns/src/main/java/org/richfaces/taglib/IndexedValueExpression.java 2008-10-22 09:53:04 UTC (rev 10859)
@@ -3,10 +3,7 @@
import javax.el.ELContext;
import javax.el.ValueExpression;
-/**
- * @author Jacob Hookom
- * @version $Id: IndexedValueExpression.java,v 1.3 2005/08/24 04:38:52 jhook Exp $
- */
+
final class IndexedValueExpression extends ValueExpression {
private static final long serialVersionUID = 5336307425512629431L;
Modified: trunk/ui/columns/src/main/java/org/richfaces/taglib/IteratedExpression.java
===================================================================
--- trunk/ui/columns/src/main/java/org/richfaces/taglib/IteratedExpression.java 2008-10-22 08:29:00 UTC (rev 10858)
+++ trunk/ui/columns/src/main/java/org/richfaces/taglib/IteratedExpression.java 2008-10-22 09:53:04 UTC (rev 10859)
@@ -1,3 +1,17 @@
+/**
+ * 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.taglib;
import java.io.Serializable;
Modified: trunk/ui/columns/src/main/java/org/richfaces/taglib/TypedCollections.java
===================================================================
--- trunk/ui/columns/src/main/java/org/richfaces/taglib/TypedCollections.java 2008-10-22 08:29:00 UTC (rev 10858)
+++ trunk/ui/columns/src/main/java/org/richfaces/taglib/TypedCollections.java 2008-10-22 09:53:04 UTC (rev 10859)
@@ -1,3 +1,39 @@
+/*
+ * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS HEADER.
+ *
+ * Copyright 1997-2007 Sun Microsystems, Inc. All rights reserved.
+ *
+ * The contents of this file are subject to the terms of either the GNU
+ * General Public License Version 2 only ("GPL") or the Common Development
+ * and Distribution License("CDDL") (collectively, the "License"). You
+ * may not use this file except in compliance with the License. You can obtain
+ * a copy of the License at https://glassfish.dev.java.net/public/CDDL+GPL.html
+ * or glassfish/bootstrap/legal/LICENSE.txt. See the License for the specific
+ * language governing permissions and limitations under the License.
+ *
+ * When distributing the software, include this License Header Notice in each
+ * file and include the License file at glassfish/bootstrap/legal/LICENSE.txt.
+ * Sun designates this particular file as subject to the "Classpath" exception
+ * as provided by Sun in the GPL Version 2 section of the License file that
+ * accompanied this code. If applicable, add the following below the License
+ * Header, with the fields enclosed by brackets [] replaced by your own
+ * identifying information: "Portions Copyrighted [year]
+ * [name of copyright owner]"
+ *
+ * Contributor(s):
+ *
+ * If you wish your version of this file to be governed by only the CDDL or
+ * only the GPL Version 2, indicate your decision by adding "[Contributor]
+ * elects to include this software in this distribution under the [CDDL or GPL
+ * Version 2] license." If you don't indicate a single choice of license, a
+ * recipient has the option to distribute your version of this file under
+ * either the CDDL, the GPL Version 2 or to extend the choice of license to
+ * its licensees as provided above. However, if you add GPL Version 2 code
+ * and therefore, elected the GPL Version 2 license, then the option applies
+ * only if the new code is made subject to such option by the copyright
+ * holder.
+ */
+
package org.richfaces.taglib;
import java.util.Collection;
17 years, 2 months
JBoss Rich Faces SVN: r10858 - trunk/ui/orderingList/src/main/java/org/richfaces/component.
by richfaces-svn-commits＠lists.jboss.org
Author: abelevich
Date: 2008-10-22 04:29:00 -0400 (Wed, 22 Oct 2008)
New Revision: 10858
Modified:
trunk/ui/orderingList/src/main/java/org/richfaces/component/UIOrderingList.java
Log:
fix NPE http://www.jboss.com/index.html?module=bb&op=viewtopic&p=4162610#4162610
Modified: trunk/ui/orderingList/src/main/java/org/richfaces/component/UIOrderingList.java
===================================================================
--- trunk/ui/orderingList/src/main/java/org/richfaces/component/UIOrderingList.java 2008-10-21 22:47:16 UTC (rev 10857)
+++ trunk/ui/orderingList/src/main/java/org/richfaces/component/UIOrderingList.java 2008-10-22 08:29:00 UTC (rev 10858)
@@ -525,13 +525,7 @@
throw new NullPointerException();
}
- // Submitted value == null means "the component was not submitted
- // at all"; validation should not continue
-
// http://jira.jboss.com/jira/browse/RF-3852
-// if (submittedValueHolder == null) {
-// return;
-// }
Object previousValue = getValue();
Object newValue = null;
@@ -572,10 +566,15 @@
}
validateValue(context, newValue);
+
+ if (submittedValueHolder == null) {
+ return;
+ }
// If our value is valid, store the new value, erase the
// "submitted" value, and emit a ValueChangeEvent if appropriate
if (isValid()) {
+
setSelection(submittedValueHolder.selection);
setActiveItem(submittedValueHolder.activeItem);
17 years, 2 months
JBoss Rich Faces SVN: r10857 - trunk/framework/impl/src/main/javascript/ajaxjsf.
by richfaces-svn-commits＠lists.jboss.org
Author: nbelaevski
Date: 2008-10-21 18:47:16 -0400 (Tue, 21 Oct 2008)
New Revision: 10857
Modified:
trunk/framework/impl/src/main/javascript/ajaxjsf/JSFAJAX.js
Log:
Fixed: ajax submit was not using cloned event
Modified: trunk/framework/impl/src/main/javascript/ajaxjsf/JSFAJAX.js
===================================================================
--- trunk/framework/impl/src/main/javascript/ajaxjsf/JSFAJAX.js 2008-10-21 16:43:03 UTC (rev 10856)
+++ trunk/framework/impl/src/main/javascript/ajaxjsf/JSFAJAX.js 2008-10-21 22:47:16 UTC (rev 10857)
@@ -709,9 +709,9 @@
var queue = A4J.AJAX.EventQueue.getOrCreateQueue(options.eventsQueue);
if (queue) {
- queue.push(containerId, form, evt, options);
+ queue.push(containerId, form, domEvt, options);
} else {
- A4J.AJAX.SubmitRequest(containerId, form, evt, options);
+ A4J.AJAX.SubmitRequest(containerId, form, domEvt, options);
}
};
17 years, 2 months
JBoss Rich Faces SVN: r10856 - in trunk/test-applications/facelets/src/main: java/util/data and 1 other directories.
by richfaces-svn-commits＠lists.jboss.org
Author: adubovsky
Date: 2008-10-21 12:43:03 -0400 (Tue, 21 Oct 2008)
New Revision: 10856
Modified:
trunk/test-applications/facelets/src/main/java/listShuttle/ListShuttle.java
trunk/test-applications/facelets/src/main/java/util/data/Data.java
trunk/test-applications/facelets/src/main/webapp/ListShuttle/ListShuttle.xhtml
trunk/test-applications/facelets/src/main/webapp/ListShuttle/ListShuttleProperty.xhtml
trunk/test-applications/facelets/src/main/webapp/ListShuttle/ListShuttleStraightforward.xhtml
Log:
Corrections in ListShuttle
Modified: trunk/test-applications/facelets/src/main/java/listShuttle/ListShuttle.java
===================================================================
--- trunk/test-applications/facelets/src/main/java/listShuttle/ListShuttle.java 2008-10-21 15:43:06 UTC (rev 10855)
+++ trunk/test-applications/facelets/src/main/java/listShuttle/ListShuttle.java 2008-10-21 16:43:03 UTC (rev 10856)
@@ -14,13 +14,14 @@
public class ListShuttle {
private int first;
private int lenght;
- private String [] statusIcon = {"/pics/error.gif", "/pics/fatal.gif", "/pics/info.gif", "/pics/passed.gif", "/pics/warn.gif"};
+ private String[] statusIcon = { "/pics/error.gif", "/pics/fatal.gif",
+ "/pics/info.gif", "/pics/passed.gif", "/pics/warn.gif" };
private boolean fastMoveControlsVisible;
private boolean fastOrderControlsVisible;
private boolean moveControlsVisible;
private boolean orderControlsVisible;
private boolean showButtonLabels;
- private boolean showSelect;
+ private boolean showSelect;
private boolean showAllSourceData;
private boolean showAllTargetData;
private boolean switchByClick;
@@ -41,7 +42,7 @@
private String sourceListWidth;
private String listsHeight;
private String sourceCaptionLabel;
- private String targetCaptionLabel;
+ private String targetCaptionLabel;
private HtmlListShuttle htmlListShuttle = null;
public HtmlListShuttle getHtmlListShuttle() {
@@ -52,13 +53,13 @@
this.htmlListShuttle = htmlListShuttle;
}
- public String add(){
+ public String add() {
ComponentInfo info = ComponentInfo.getInstance();
info.addField(htmlListShuttle);
return null;
}
-
- public ListShuttle() {
+
+ public ListShuttle() {
this.first = 1;
this.lenght = 10;
this.showSelect = true;
@@ -79,9 +80,9 @@
this.upControlLabel = "up";
this.info = new ArrayList<String>();
this.switchByClick = false;
- this.targetListWidth = "300";
- this.sourceListWidth = "300";
- this.listsHeight = "400";
+ this.targetListWidth = "450";
+ this.sourceListWidth = "450";
+ this.listsHeight = "300";
this.sourceCaptionLabel = "sourceCaptionLabel";
this.targetCaptionLabel = "targetCaptionLabel";
this.targetValue = new ArrayList<Data>();
@@ -214,14 +215,16 @@
}
public void addNewItem() {
- if(lenght < 0) lenght = 0;
- if(sourceValue.size() > lenght)
- for(int i = lenght; i < sourceValue.size(); )
+ if (lenght < 0)
+ lenght = 0;
+ if (sourceValue.size() > lenght)
+ for (int i = lenght; i < sourceValue.size();)
sourceValue.remove(i);
else
- for(int i = sourceValue.size() + 1; i <= lenght; i++)
- sourceValue.add(new Data(i, "Button " + i, "Link " + i, "select" +(i % 5), statusIcon[i % 5]));
- }
+ for (int i = sourceValue.size() + 1; i <= lenght; i++)
+ sourceValue.add(new Data(i, "Button " + i, "Link " + i,
+ "Select" + (i % 5), statusIcon[i % 5], "Input" + i));
+ }
public int getLenght() {
return lenght;
@@ -245,12 +248,12 @@
public void setTargetValue(ArrayList<Data> targetValue) {
this.targetValue = targetValue;
}
-
+
public void cbAction() {
info.clear();
info.add("commandButton submit();");
}
-
+
public void clAction() {
info.clear();
info.add("commandLink submit();");
@@ -295,7 +298,7 @@
public void setTargetSelection(Collection targetSelection) {
this.targetSelection = targetSelection;
}
-
+
public boolean isSwitchByClick() {
return switchByClick;
}
@@ -343,14 +346,18 @@
public void setTargetCaptionLabel(String targetCaptionLabel) {
this.targetCaptionLabel = targetCaptionLabel;
}
-
+
private void addSelection(Collection<Data> selection, String description) {
- if(selection == null) return;
+ if (selection == null)
+ return;
Iterator<Data> inter = selection.iterator();
Data data = new Data();
while (inter.hasNext()) {
data = inter.next();
- info.add(description + ": " + data.getInt0() + "; " + data.getStr0() + "; " + data.getStr0() + "submit(); " + data.getStr1() + "; " + data.getStr1() + "submit(); " + data.getStr2() + "; " + data.getStr3());
+ info.add(description + ": " + data.getInt0() + "; "
+ + data.getStr0() + "; " + data.getStr0() + "submit(); "
+ + data.getStr1() + "; " + data.getStr1() + "submit(); "
+ + data.getStr2() + "; " + data.getStr3());
}
}
}
Modified: trunk/test-applications/facelets/src/main/java/util/data/Data.java
===================================================================
--- trunk/test-applications/facelets/src/main/java/util/data/Data.java 2008-10-21 15:43:06 UTC (rev 10855)
+++ trunk/test-applications/facelets/src/main/java/util/data/Data.java 2008-10-21 16:43:03 UTC (rev 10856)
@@ -4,29 +4,94 @@
import java.util.Date;
import java.util.Random;
-public class Data implements Serializable{
+public class Data implements Serializable {
/**
*
*/
private static final long serialVersionUID = 1L;
- public static final String[] statusIcon = {"/pics/error.gif", "/pics/fatal.gif", "/pics/info.gif", "/pics/passed.gif", "/pics/warn.gif"};
- public static final String[] status = {"error", "fatal", "info", "passed", "warn"};
-
- public static final String[] cityAfrica = {"Africa", "Algeria", "Angola", "Bassas da India", "Benin", "Botswana", "Burkina Faso", "Burundi", "Cameroon", "Central African Republic", "Chad", "Comoros", "Democratic Republic of the Congo", "Djibouti", "Egypt", "Equatorial Guinea", "Eritrea", "Ethiopia", "Europa Island", "Gabon", "Gambia", "Ghana", "Glorioso Islands", "Guinea", "Guinea-Bissau", "Ivory Coast", "Juan de Nova Island", "Kenya", "Lesotho", "Liberia", "Libya", "Madagascar", "Malawi", "Mali", "Mauritania", "Mauritius Island", "Mayotte", "Morocco", "Mozambique", "Namibia", "Nigeria", "Republic of the Congo", "Reunion", "Rwanda", "Niger", "Saint Helena", "Sao Tome and Principe", "Senegal", "Seychelles", "Sierra Leone", "Somalia", "South Africa", "Sudan", "Swaziland", "Tanzania", "Togo", "Tromelin Island", "Tunisia", "Uganda", "Western Sahara", "Zambia", "Zimbabwe"};
- public static final String[] cityAsia = {"Asia", "Afghanistan", "Armenia", "Azerbaijan", "Bangladesh", "Bhutan", "China", "Georgia", "India", "Japan", "Kazakhstan", "Korea, North", "Korea, South", "Kyrgyzstan", "Maldives", "Mongolia", "Nepal", "Pakistan", "Russia", "Sri Lanka", "Tajikistan", "Turkmenistan", "Uzbekistan"};
- public static final String[] cityCAmerica = {"Central America", "Belize", "Costa Rica", "El Salvador", "Guatemala", "Honduras", "Nicaragua", "Panama"};
- public static final String[] cityEurope = {"Europe", "Albania", "Andorra", "Austria", "Belarus", "Belgium", "Bosnia and Herzegovina", "Bulgaria", "Canary Islands", "Croatia", "Czech Republic", "Denmark", "Estonia", "Faroe Islands", "Finland", "France", "Germany", "Gibraltar", "Greece", "Guernsey", "Hungary", "Iceland", "Ireland", "Isle of Man", "Italy", "Jersey", "Latvia", "Liechtenstein", "Lithuania", "Luxembourg", "Macedonia", "Malta", "Moldova", "Monaco", "Montenegro", "Netherlands", "Norway", "Poland", "Portugal", "Romania", "San Marino", "Serbia and Montenegro", "Slovakia", "Slovenia", "Spain", "Sweden", "Switzerland", "Ukraine", "United Kingdom", "Vatican The Holy See"};
- public static final String[] cityMEast = {"Middle East", "Akrotiri", "Bahrain", "Cyprus", "Dhekelia", "Gaza Strip", "Iran", "Iraq", "Israel", "Jordan", "Kuwait", "Lebanon", "Oman", "Qatar", "Saudi Arabia", "Syria", "Turkey", "United Arab Emirates", "West Bank", "Yemen"};
- public static final String[] cityNAmerica = {"North America", "Bermuda", "Canada", "Greenland", "Mexico", "Saint Pierre and Miquelon", "United States of America"};
- public static final String[] cityOceania = {"Oceania", "American Samoa", "Australia", "Baker Island", "Cook Islands", "Coral Sea Islands", "Fiji", "French Polynesia", "Guam", "Howland Island", "Jarvis Island", "Johnston Atoll", "Kingman Reef", "Kiribati", "Marshall Islands", "Micronesia", "Midway Islands", "Nauru", "New Caledonia", "New Zealand", "Niue", "Norfolk Island", "Northern Mariana Islands", "Palau", "Palmyra Atoll", "Papua New Guinea", "Pitcairn Islands", "Samoa", "Solomon Islands", "Tokelau", "Tonga", "Tuvalu", "Vanuatu", "Wake Island", "Wallis and Futuna"};
- public static final String[] citySAmerica = {"South America","Argentina", "Bolivia", "Brazil", "Chile", "Colombia", "Easter Island", "Ecuador", "Falkland Islands", "French Guiana", "Guyana", "Paraguay", "Peru", "Suriname", "Uruguay", "Venezuela"};
- public static final String[] citySEAsia = {"SouthEast Asia", "Ashmore and Cartier Islands", "Brunei", "Burma", "Cambodia", "Christmas Island", "Cocos (Keeling) Islands", "East Timor", "Hong Kong", "Indonesia", "Laos", "Malaysia", "Paracel Islands", "Philippines", "Singapore", "Spratly Islands", "Taiwan", "Thailand", "Vietnam"};
- public static final String[] cityCaribbean = {"The Caribbean", "Anguilla", "Antigua and Barbuda", "Aruba", "Barbados", "British Virgin Islands", "Cayman Islands", "Cuba", "Dominica", "Dominican Republic", "Grenada", "Guadeloupe", "Haiti", "Jamaica", "Martinique", "Montserrat", "Navassa Island", "Netherlands Antilles", "Puerto Rico", "Saint Barthelemy", "Saint Kitts and Nevis", "Saint Lucia", "Saint Vincent and the Grenadines", "The Bahamas", "Trinidad and Tobago", "Turks and Caicos Islands", "Virgin Islands"};
+ public static final String[] statusIcon = { "/pics/error.gif",
+ "/pics/fatal.gif", "/pics/info.gif", "/pics/passed.gif",
+ "/pics/warn.gif" };
+ public static final String[] status = { "error", "fatal", "info", "passed",
+ "warn" };
+ public static final String[] cityAfrica = { "Africa", "Algeria", "Angola",
+ "Bassas da India", "Benin", "Botswana", "Burkina Faso", "Burundi",
+ "Cameroon", "Central African Republic", "Chad", "Comoros",
+ "Democratic Republic of the Congo", "Djibouti", "Egypt",
+ "Equatorial Guinea", "Eritrea", "Ethiopia", "Europa Island",
+ "Gabon", "Gambia", "Ghana", "Glorioso Islands", "Guinea",
+ "Guinea-Bissau", "Ivory Coast", "Juan de Nova Island", "Kenya",
+ "Lesotho", "Liberia", "Libya", "Madagascar", "Malawi", "Mali",
+ "Mauritania", "Mauritius Island", "Mayotte", "Morocco",
+ "Mozambique", "Namibia", "Nigeria", "Republic of the Congo",
+ "Reunion", "Rwanda", "Niger", "Saint Helena",
+ "Sao Tome and Principe", "Senegal", "Seychelles", "Sierra Leone",
+ "Somalia", "South Africa", "Sudan", "Swaziland", "Tanzania",
+ "Togo", "Tromelin Island", "Tunisia", "Uganda", "Western Sahara",
+ "Zambia", "Zimbabwe" };
+ public static final String[] cityAsia = { "Asia", "Afghanistan", "Armenia",
+ "Azerbaijan", "Bangladesh", "Bhutan", "China", "Georgia", "India",
+ "Japan", "Kazakhstan", "Korea, North", "Korea, South",
+ "Kyrgyzstan", "Maldives", "Mongolia", "Nepal", "Pakistan",
+ "Russia", "Sri Lanka", "Tajikistan", "Turkmenistan", "Uzbekistan" };
+ public static final String[] cityCAmerica = { "Central America", "Belize",
+ "Costa Rica", "El Salvador", "Guatemala", "Honduras", "Nicaragua",
+ "Panama" };
+ public static final String[] cityEurope = { "Europe", "Albania", "Andorra",
+ "Austria", "Belarus", "Belgium", "Bosnia and Herzegovina",
+ "Bulgaria", "Canary Islands", "Croatia", "Czech Republic",
+ "Denmark", "Estonia", "Faroe Islands", "Finland", "France",
+ "Germany", "Gibraltar", "Greece", "Guernsey", "Hungary", "Iceland",
+ "Ireland", "Isle of Man", "Italy", "Jersey", "Latvia",
+ "Liechtenstein", "Lithuania", "Luxembourg", "Macedonia", "Malta",
+ "Moldova", "Monaco", "Montenegro", "Netherlands", "Norway",
+ "Poland", "Portugal", "Romania", "San Marino",
+ "Serbia and Montenegro", "Slovakia", "Slovenia", "Spain", "Sweden",
+ "Switzerland", "Ukraine", "United Kingdom", "Vatican The Holy See" };
+ public static final String[] cityMEast = { "Middle East", "Akrotiri",
+ "Bahrain", "Cyprus", "Dhekelia", "Gaza Strip", "Iran", "Iraq",
+ "Israel", "Jordan", "Kuwait", "Lebanon", "Oman", "Qatar",
+ "Saudi Arabia", "Syria", "Turkey", "United Arab Emirates",
+ "West Bank", "Yemen" };
+ public static final String[] cityNAmerica = { "North America", "Bermuda",
+ "Canada", "Greenland", "Mexico", "Saint Pierre and Miquelon",
+ "United States of America" };
+ public static final String[] cityOceania = { "Oceania", "American Samoa",
+ "Australia", "Baker Island", "Cook Islands", "Coral Sea Islands",
+ "Fiji", "French Polynesia", "Guam", "Howland Island",
+ "Jarvis Island", "Johnston Atoll", "Kingman Reef", "Kiribati",
+ "Marshall Islands", "Micronesia", "Midway Islands", "Nauru",
+ "New Caledonia", "New Zealand", "Niue", "Norfolk Island",
+ "Northern Mariana Islands", "Palau", "Palmyra Atoll",
+ "Papua New Guinea", "Pitcairn Islands", "Samoa", "Solomon Islands",
+ "Tokelau", "Tonga", "Tuvalu", "Vanuatu", "Wake Island",
+ "Wallis and Futuna" };
+ public static final String[] citySAmerica = { "South America", "Argentina",
+ "Bolivia", "Brazil", "Chile", "Colombia", "Easter Island",
+ "Ecuador", "Falkland Islands", "French Guiana", "Guyana",
+ "Paraguay", "Peru", "Suriname", "Uruguay", "Venezuela" };
+ public static final String[] citySEAsia = { "SouthEast Asia",
+ "Ashmore and Cartier Islands", "Brunei", "Burma", "Cambodia",
+ "Christmas Island", "Cocos (Keeling) Islands", "East Timor",
+ "Hong Kong", "Indonesia", "Laos", "Malaysia", "Paracel Islands",
+ "Philippines", "Singapore", "Spratly Islands", "Taiwan",
+ "Thailand", "Vietnam" };
+ public static final String[] cityCaribbean = { "The Caribbean", "Anguilla",
+ "Antigua and Barbuda", "Aruba", "Barbados",
+ "British Virgin Islands", "Cayman Islands", "Cuba", "Dominica",
+ "Dominican Republic", "Grenada", "Guadeloupe", "Haiti", "Jamaica",
+ "Martinique", "Montserrat", "Navassa Island",
+ "Netherlands Antilles", "Puerto Rico", "Saint Barthelemy",
+ "Saint Kitts and Nevis", "Saint Lucia",
+ "Saint Vincent and the Grenadines", "The Bahamas",
+ "Trinidad and Tobago", "Turks and Caicos Islands", "Virgin Islands" };
+
private String str0;
private String str1;
private String str2;
private String str3;
+ private String str4;
private int int0;
private int int1;
private int int2;
@@ -36,12 +101,13 @@
private boolean bool2;
private boolean bool3;
private Date date0;
-
+
public Data() {
this.str0 = "";
this.str1 = "";
this.str2 = "";
this.str3 = "";
+ this.str4 = "";
this.int0 = 0;
this.int1 = 0;
this.int2 = 0;
@@ -52,7 +118,8 @@
this.bool3 = false;
}
- public Data(int int0, int int1, String str0, int int2, String str1, int int3, String str2, String str3, boolean bool0) {
+ public Data(int int0, int int1, String str0, int int2, String str1,
+ int int3, String str2, String str3, boolean bool0) {
this.str0 = str0;
this.str1 = str1;
this.str2 = str2;
@@ -63,7 +130,7 @@
this.int3 = int3;
this.bool0 = bool0;
}
-
+
public Data(String str0, String str1, String str2, String str3, int int0,
int int1, int int2, int int3, boolean bool0, boolean bool1,
boolean bool2, boolean bool3) {
@@ -81,22 +148,22 @@
this.bool3 = bool3;
}
- public Data(String str0, String str1, String str2, String str3){
+ public Data(String str0, String str1, String str2, String str3) {
this.str0 = str0;
this.str1 = str1;
this.str2 = str2;
this.str3 = str3;
}
-
- public Data(int int0, String str0, String str1, String str2, String str3){
+
+ public Data(int int0, String str0, String str1, String str2, String str3) {
this.int0 = int0;
this.str0 = str0;
this.str1 = str1;
this.str2 = str2;
this.str3 = str3;
}
-
- public Data(int int0, String str0, String str1, String str2, boolean bool0){
+
+ public Data(int int0, String str0, String str1, String str2, boolean bool0) {
this.int0 = int0;
this.str0 = str0;
this.str1 = str1;
@@ -104,125 +171,158 @@
this.bool0 = bool0;
}
- //for scrollableDataTable component
- public Data(int int0, String str0, String str1, String str2, String str3, Date date0){
+ public Data(int int0, String str0, String str1, String str2, String str3, String str4){
this.int0 = int0;
this.str0 = str0;
this.str1 = str1;
this.str2 = str2;
this.str3 = str3;
+ this.str4 = str4;
+ }
+
+ // for scrollableDataTable component
+ public Data(int int0, String str0, String str1, String str2, String str3,
+ Date date0) {
+ this.int0 = int0;
+ this.str0 = str0;
+ this.str1 = str1;
+ this.str2 = str2;
+ this.str3 = str3;
this.date0 = date0;
}
-
- public Data(String str0){
+
+ public Data(String str0) {
this.str0 = str0;
- }
-
+ }
+
public Data(int int0) {
this.int0 = int0;
}
-
- public Data(String str0, String str1){
+
+ public Data(String str0, String str1) {
this.str0 = str0;
this.str1 = str1;
}
-
- public Data(String str0, int int0){
+
+ public Data(String str0, int int0) {
this.str0 = str0;
this.int0 = int0;
}
-
- public Data(String str0, int int0, boolean bool0){
+
+ public Data(String str0, int int0, boolean bool0) {
this.str0 = str0;
this.int0 = int0;
this.bool0 = bool0;
}
-
+
public String getStr0() {
return str0;
}
+
public void setStr0(String str0) {
this.str0 = str0;
}
+
public String getStr1() {
return str1;
}
+
public void setStr1(String str1) {
this.str1 = str1;
}
+
public String getStr2() {
return str2;
}
+
public void setStr2(String str2) {
this.str2 = str2;
}
+
public String getStr3() {
return str3;
}
+
public void setStr3(String str3) {
this.str3 = str3;
}
+
public int getInt0() {
return int0;
}
+
public void setInt0(int int0) {
this.int0 = int0;
}
+
public int getInt1() {
return int1;
}
+
public void setInt1(int int1) {
this.int1 = int1;
}
+
public int getInt2() {
return int2;
}
+
public void setInt2(int int2) {
this.int2 = int2;
}
+
public int getInt3() {
return int3;
}
+
public void setInt3(int int3) {
this.int3 = int3;
}
+
public boolean isBool0() {
return bool0;
}
+
public void setBool0(boolean bool0) {
this.bool0 = bool0;
}
+
public boolean isBool1() {
return bool1;
}
+
public void setBool1(boolean bool1) {
this.bool1 = bool1;
}
+
public boolean isBool2() {
return bool2;
}
+
public void setBool2(boolean bool2) {
this.bool2 = bool2;
}
+
public boolean isBool3() {
return bool3;
}
+
public void setBool3(boolean bool3) {
this.bool3 = bool3;
}
-
- public static String Random(int size){
- char [] c = new char[size];
- for(int i = 0; i < size; i++){
- c[i] = (char)(new Random().nextInt(25) + 97);
+
+ public static String Random(int size) {
+ char[] c = new char[size];
+ for (int i = 0; i < size; i++) {
+ c[i] = (char) (new Random().nextInt(25) + 97);
}
return new String(c);
}
-
- public static String RandomUp(int size){
- char [] c = new char[size];
- for(int i = 0; i < size; i++){
- c[i] = (char)(new Random().nextInt(25) + 65);
+
+ public static String RandomUp(int size) {
+ char[] c = new char[size];
+ for (int i = 0; i < size; i++) {
+ c[i] = (char) (new Random().nextInt(25) + 65);
}
return new String(c);
}
@@ -251,7 +351,7 @@
@Override
public String toString() {
- return str0 +":"+int0;
+ return str0 + ":" + int0;
}
public Date getDate0() {
@@ -261,4 +361,12 @@
public void setDate0(Date date0) {
this.date0 = date0;
}
+
+ public String getStr4() {
+ return str4;
+ }
+
+ public void setStr4(String str4) {
+ this.str4 = str4;
+ }
}
Modified: trunk/test-applications/facelets/src/main/webapp/ListShuttle/ListShuttle.xhtml
===================================================================
--- trunk/test-applications/facelets/src/main/webapp/ListShuttle/ListShuttle.xhtml 2008-10-21 15:43:06 UTC (rev 10855)
+++ trunk/test-applications/facelets/src/main/webapp/ListShuttle/ListShuttle.xhtml 2008-10-21 16:43:03 UTC (rev 10856)
@@ -1,91 +1,156 @@
-<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="listShuttleSubviewID">
- <rich:listShuttle id="listShuttleID" var="item"
- sourceValue="#{listShuttle.sourceValue}" targetValue="#{listShuttle.targetValue}"
- bottomControlLabel="#{listShuttle.bottomControlLabel}" copyAllControlLabel="#{listShuttle.copyAllControlLabel}"
- copyControlLabel="#{listShuttle.copyControlLabel}" downControlLabel="#{listShuttle.downControlLabel}"
- fastMoveControlsVisible="#{listShuttle.fastMoveControlsVisible}" converter="listShuttleConverter"
- fastOrderControlsVisible="#{listShuttle.fastOrderControlsVisible}" first="#{listShuttle.first}"
- moveControlsVisible="#{listShuttle.moveControlsVisible}" orderControlsVisible="#{listShuttle.orderControlsVisible}"
- removeAllControlLabel="#{listShuttle.removeAllControlLabel}" removeControlLabel="#{listShuttle.removeControlLabel}"
- sourceSelection="#{listShuttle.sourceSelection}" targetSelection="#{listShuttle.targetSelection}"
- showButtonLabels="#{listShuttle.showButtonLabels}" switchByClick="#{listShuttle.switchByClick}"
- targetListWidth="#{listShuttle.targetListWidth}" sourceListWidth="#{listShuttle.sourceListWidth}"
- listsHeight="#{listShuttle.listsHeight}" sourceCaptionLabel="#{listShuttle.sourceCaptionLabel}"
- targetCaptionLabel="#{listShuttle.targetCaptionLabel}"
- topControlLabel="#{listShuttle.topControlLabel}" upControlLabel="#{listShuttle.upControlLabel}"
- onmousemove="#{event.onmousemove}" onclick="#{event.onclick}" ondblclick="#{event.ondblclick}"
- onmouseout="#{event.onmouseout}" onmouseover="#{event.onmouseover}" onorderchanged="#{event.onorderchanged}" ontopclick="#{event.ontopclick}"
- onupclick="#{event.onupclick}" ondownclick="#{event.ondownclick}" onbottomclick="#{event.onbottomclick}" binding="#{listShuttle.htmlListShuttle}">
+<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="listShuttleSubviewID">
+
+ <rich:listShuttle id="listShuttleID" var="item"
+ sourceValue="#{listShuttle.sourceValue}"
+ targetValue="#{listShuttle.targetValue}"
+ bottomControlLabel="#{listShuttle.bottomControlLabel}"
+ copyAllControlLabel="#{listShuttle.copyAllControlLabel}"
+ copyControlLabel="#{listShuttle.copyControlLabel}"
+ downControlLabel="#{listShuttle.downControlLabel}"
+ fastMoveControlsVisible="#{listShuttle.fastMoveControlsVisible}"
+ converter="listShuttleConverter"
+ fastOrderControlsVisible="#{listShuttle.fastOrderControlsVisible}"
+ first="#{listShuttle.first}"
+ moveControlsVisible="#{listShuttle.moveControlsVisible}"
+ orderControlsVisible="#{listShuttle.orderControlsVisible}"
+ removeAllControlLabel="#{listShuttle.removeAllControlLabel}"
+ removeControlLabel="#{listShuttle.removeControlLabel}"
+ sourceSelection="#{listShuttle.sourceSelection}"
+ targetSelection="#{listShuttle.targetSelection}"
+ showButtonLabels="#{listShuttle.showButtonLabels}"
+ switchByClick="#{listShuttle.switchByClick}"
+ targetListWidth="#{listShuttle.targetListWidth}"
+ sourceListWidth="#{listShuttle.sourceListWidth}"
+ listsHeight="#{listShuttle.listsHeight}"
+ sourceCaptionLabel="#{listShuttle.sourceCaptionLabel}"
+ targetCaptionLabel="#{listShuttle.targetCaptionLabel}"
+ topControlLabel="#{listShuttle.topControlLabel}"
+ upControlLabel="#{listShuttle.upControlLabel}"
+ onmousemove="#{event.onmousemove}" onclick="#{event.onclick}"
+ ondblclick="#{event.ondblclick}" onmouseout="#{event.onmouseout}"
+ onmouseover="#{event.onmouseover}"
+ onorderchanged="#{event.onorderchanged}"
+ ontopclick="#{event.ontopclick}" onupclick="#{event.onupclick}"
+ ondownclick="#{event.ondownclick}"
+ onbottomclick="#{event.onbottomclick}"
+ binding="#{listShuttle.htmlListShuttle}">
- <h:column>
- <f:facet name="header">
- <h:outputText value="Number" />
- </f:facet>
- <h:outputText value="#{item.int0}" />
- </h:column>
+ <!--
+ <f:facet name="topControl">
+ <h:outputText value="top" />
+ </f:facet>
+ <f:facet name="bottomControl">
+ <h:outputText value="bottom" />
+ </f:facet>
+ <f:facet name="upControl">
+ <h:outputText value="up" />
+ </f:facet>
+ <f:facet name="downControl">
+ <h:outputText value="down" />
+ </f:facet>
+ <f:facet name="topControlDisabled">
+ <h:outputText value="top disabled" />
+ </f:facet>
+ <f:facet name="bottomControlDisabled">
+ <h:outputText value="bottom disabled" />
+ </f:facet>
+ <f:facet name="upControlDisabled">
+ <h:outputText value="up disabled" />
+ </f:facet>
+ <f:facet name="downControlDisabled">
+ <h:outputText value="down disabled" />
+ </f:facet>
+
+
+ <f:facet name="copyControl">
+ <h:outputText value="copy" />
+ </f:facet>
+ <f:facet name="removeControl">
+ <h:outputText value="remove" />
+ </f:facet>
+ <f:facet name="copyAllControl">
+ <h:outputText value="copy all" />
+ </f:facet>
+ <f:facet name="removeAllControl">
+ <h:outputText value="remove all" />
+ </f:facet>
+ <f:facet name="copyControlDisabled">
+ <h:outputText value="copy disabled" />
+ </f:facet>
+ <f:facet name="removeControlDisabled">
+ <h:outputText value="remove disabled" />
+ </f:facet>
+ <f:facet name="copyAllControlDisabled">
+ <h:outputText value="copy all disabled" />
+ </f:facet>
+ <f:facet name="removeAllControlDisabled">
+ <h:outputText value="remove all disabled" />
+ </f:facet>
+ -->
- <h:column>
- <f:facet name="header">
- <h:outputText value="Input" />
- </f:facet>
- <h:inputText value="#{item.str0}" />
- </h:column>
+ <h:column>
+ <f:facet name="header">
+ <h:outputText value="Output" />
+ </f:facet>
+ <h:outputText value="#{item.int0}" />
+ </h:column>
- <h:column>
- <f:facet name="header">
- <h:outputText value="Button" />
- </f:facet>
- <h:commandButton onclick="submit();" action="#{listShuttle.cbAction}" value="#{item.str0} submit();"/>
- </h:column>
+ <h:column>
+ <f:facet name="header">
+ <h:outputText value="Input" />
+ </f:facet>
+ <h:inputText value="#{item.str4}" />
+ </h:column>
- <h:column>
- <f:facet name="header">
- <h:outputText value="Input" />
- </f:facet>
- <h:inputText value="#{item.str1}" />
- </h:column>
+ <h:column>
+ <f:facet name="header">
+ <h:outputText value="Button" />
+ </f:facet>
+ <h:commandButton onclick="submit();" action="#{listShuttle.cbAction}"
+ value="#{item.str0} sbmt();" />
+ </h:column>
- <h:column>
- <f:facet name="header">
- <h:outputText value="Link" />
- </f:facet>
- <a4j:commandLink action="#{listShuttle.clAction}" value="#{item.str1} submit()" reRender="listShuttleID"></a4j:commandLink>
- </h:column>
+ <h:column>
+ <f:facet name="header">
+ <h:outputText value="a4jLink" />
+ </f:facet>
+ <a4j:commandLink action="#{listShuttle.clAction}"
+ value="#{item.str1} a4j()" reRender="listShuttleID"></a4j:commandLink>
+ </h:column>
- <h:column>
- <f:facet name="header">
- <h:outputText value="select" />
- </f:facet>
- <h:selectOneMenu value="#{item.str2}">
- <f:selectItem itemLabel="select0" itemValue="select0" />
- <f:selectItem itemLabel="select1" itemValue="select1" />
- <f:selectItem itemLabel="select2" itemValue="select2" />
- <f:selectItem itemLabel="select3" itemValue="select3" />
- <f:selectItem itemLabel="select4" itemValue="select4" />
- <a4j:support event="onclick" reRender="listShuttleID"></a4j:support>
- </h:selectOneMenu>
- </h:column>
+ <h:column>
+ <f:facet name="header">
+ <h:outputText value="Select" />
+ </f:facet>
+ <h:selectOneMenu value="#{item.str2}">
+ <f:selectItem itemLabel="select0" itemValue="select0" />
+ <f:selectItem itemLabel="select1" itemValue="select1" />
+ <f:selectItem itemLabel="select2" itemValue="select2" />
+ <f:selectItem itemLabel="select3" itemValue="select3" />
+ <f:selectItem itemLabel="select4" itemValue="select4" />
+ <a4j:support event="onclick" reRender="listShuttleID"></a4j:support>
+ </h:selectOneMenu>
+ </h:column>
- <h:column>
- <f:facet name="header">
- <h:outputText value="Text" />
- </f:facet>
- <h:outputText value="#{item.str3}" />
- </h:column>
+ <h:column>
+ <f:facet name="header">
+ <h:outputText value="graphicImage" />
+ </f:facet>
+ <h:graphicImage value="#{item.str3}" />
+ </h:column>
- <h:column>
- <f:facet name="header">
- <h:outputText value="graphicImage" />
- </f:facet>
- <h:graphicImage value="#{item.str3}" />
- </h:column>
-
- <rich:column>
- <f:facet name="header">
- <h:outputText value="Link"></h:outputText>
- </f:facet>
- <h:outputLink value="http://www.jboss.com/"><f:verbatim>Link</f:verbatim></h:outputLink>
- </rich:column>
- </rich:listShuttle>
+ <rich:column>
+ <f:facet name="header">
+ <h:outputText value="OutputLink"></h:outputText>
+ </f:facet>
+ <h:outputLink value="http://www.jboss.com/">
+ <f:verbatim>outputLink</f:verbatim>
+ </h:outputLink>
+ </rich:column>
+ </rich:listShuttle>
</f:subview>
\ No newline at end of file
Modified: trunk/test-applications/facelets/src/main/webapp/ListShuttle/ListShuttleProperty.xhtml
===================================================================
--- trunk/test-applications/facelets/src/main/webapp/ListShuttle/ListShuttleProperty.xhtml 2008-10-21 15:43:06 UTC (rev 10855)
+++ trunk/test-applications/facelets/src/main/webapp/ListShuttle/ListShuttleProperty.xhtml 2008-10-21 16:43:03 UTC (rev 10856)
@@ -5,68 +5,80 @@
xmlns:h="http://java.sun.com/jsf/html"
xmlns:rich="http://richfaces.org/rich"
id="listShuttlePropertySubviewID">
- <h:commandButton action="#{listShuttle.add}" value="add test" />
- <h:panelGrid columns="3">
- <h:column></h:column>
- <h:outputText value="JavaScript API"></h:outputText>
- <h:column></h:column>
- <a4j:commandLink
- onclick="$('formID:listShuttleSubviewID:listShuttleID').component.hide()"
- value="hide"></a4j:commandLink>
- <a4j:commandLink
- onclick="$('formID:listShuttleSubviewID:listShuttleID').component.show()"
- value="show"></a4j:commandLink>
- <a4j:commandLink
- onclick="alert($('formID:listShuttleSubviewID:listShuttleID').component.isShown())"
- value="isShown"></a4j:commandLink>
- <a4j:commandLink
- onclick="$('formID:listShuttleSubviewID:listShuttleID').component.enable()"
- value="enable"></a4j:commandLink>
- <a4j:commandLink
- onclick="$('formID:listShuttleSubviewID:listShuttleID').component.disable()"
- value="disable"></a4j:commandLink>
- <a4j:commandLink
- onclick="alert($('formID:listShuttleSubviewID:listShuttleID').component.isEnabled())"
- value="isEnabled"></a4j:commandLink>
- <a4j:commandLink
- onclick="$('formID:listShuttleSubviewID:listShuttleID').component.up()"
- value="up"></a4j:commandLink>
- <a4j:commandLink
- onclick="$('formID:listShuttleSubviewID:listShuttleID').component.down()"
- value="down"></a4j:commandLink>
- <a4j:commandLink
- onclick="$('formID:listShuttleSubviewID:listShuttleID').component.top()"
- value="top"></a4j:commandLink>
- <a4j:commandLink
- onclick="$('formID:listShuttleSubviewID:listShuttleID').component.bottom()"
- value="bottom"></a4j:commandLink>
- <a4j:commandLink
- onclick="$('formID:listShuttleSubviewID:listShuttleID').component.copy()"
- value="copy"></a4j:commandLink>
- <a4j:commandLink
- onclick="$('formID:listShuttleSubviewID:listShuttleID').component.remove()"
- value="remove"></a4j:commandLink>
- <a4j:commandLink
- onclick="$('formID:listShuttleSubviewID:listShuttleID').component.copyAll()"
- value="copyAll"></a4j:commandLink>
- <a4j:commandLink
- onclick="$('formID:listShuttleSubviewID:listShuttleID').component.removeAll()"
- value="removeAll"></a4j:commandLink>
- <a4j:commandLink
- onclick="alert($('formID:listShuttleSubviewID:listShuttleID').component.targetList.getSelection())"
- value="targetList.getSelection"></a4j:commandLink>
+ <h:commandButton value="add test"
+ action="#{listShuttle.add}"></h:commandButton>
+
+ <br />
+ <br />
+ <h:outputText value="JavaScript API" style="font-weight: bold;" />
+ <h:panelGrid columns="4" border="1">
+ <h:panelGroup>
<a4j:commandLink
- onclick="alert($('formID:listShuttleSubviewID:listShuttleID').component.sourceList.getSelection())"
- value="sourceList.getSelection"></a4j:commandLink>
- <a4j:commandLink
- onclick="alert($('formID:listShuttleSubviewID:listShuttleID').component.targetList.getItems())"
- value="targetList.getItems"></a4j:commandLink>
+ onclick="$('formID:listShuttleSubviewID:listShuttleID').component.enable()"
+ value="enable"></a4j:commandLink>
+ <br />
<a4j:commandLink
- onclick="alert($('formID:listShuttleSubviewID:listShuttleID').component.sourceList.getItems())"
- value="sourceList.getItems"></a4j:commandLink>
+ onclick="$('formID:listShuttleSubviewID:listShuttleID').component.disable()"
+ value="disable"></a4j:commandLink>
+ <br />
+ <a4j:commandLink
+ onclick="alert($('formID:listShuttleSubviewID:listShuttleID').component.isEnabled())"
+ value="isEnabled"></a4j:commandLink>
+ </h:panelGroup>
+ <h:panelGroup>
+ <a4j:commandLink
+ onclick="$('formID:listShuttleSubviewID:listShuttleID').component.up()"
+ value="up"></a4j:commandLink>
+ <br />
+ <a4j:commandLink
+ onclick="$('formID:listShuttleSubviewID:listShuttleID').component.down()"
+ value="down"></a4j:commandLink>
+ <br />
+ <a4j:commandLink
+ onclick="$('formID:listShuttleSubviewID:listShuttleID').component.top()"
+ value="top"></a4j:commandLink>
+ <br />
+ <a4j:commandLink
+ onclick="$('formID:listShuttleSubviewID:listShuttleID').component.bottom()"
+ value="bottom"></a4j:commandLink>
+ </h:panelGroup>
+ <h:panelGroup>
+ <a4j:commandLink
+ onclick="$('formID:listShuttleSubviewID:listShuttleID').component.copy()"
+ value="copy"></a4j:commandLink>
+ <br />
+ <a4j:commandLink
+ onclick="$('formID:listShuttleSubviewID:listShuttleID').component.remove()"
+ value="remove"></a4j:commandLink>
+ <br />
+ <a4j:commandLink
+ onclick="$('formID:listShuttleSubviewID:listShuttleID').component.copyAll()"
+ value="copyAll"></a4j:commandLink>
+ <br />
+ <a4j:commandLink
+ onclick="$('formID:listShuttleSubviewID:listShuttleID').component.removeAll()"
+ value="removeAll"></a4j:commandLink>
+ </h:panelGroup>
+ <h:panelGroup>
+ <a4j:commandLink
+ onclick="alert($('formID:listShuttleSubviewID:listShuttleID').component.targetList.getSelection())"
+ value="targetList.getSelection"></a4j:commandLink>
+ <br />
+ <a4j:commandLink
+ onclick="alert($('formID:listShuttleSubviewID:listShuttleID').component.sourceList.getSelection())"
+ value="sourceList.getSelection"></a4j:commandLink>
+ <br />
+ <a4j:commandLink
+ onclick="alert($('formID:listShuttleSubviewID:listShuttleID').component.targetList.getItems())"
+ value="targetList.getItems"></a4j:commandLink>
+ <br />
+ <a4j:commandLink
+ onclick="alert($('formID:listShuttleSubviewID:listShuttleID').component.sourceList.getItems())"
+ value="sourceList.getItems"></a4j:commandLink>
+ </h:panelGroup>
</h:panelGrid>
-
+
<h:panelGrid columns="2">
<h:column></h:column>
<h:panelGroup>
@@ -85,9 +97,7 @@
</h:panelGroup>
<h:outputText value="first" />
- <h:inputText value="#{listShuttle.first}">
- <a4j:support event="onclick" reRender="listShuttleID"></a4j:support>
- </h:inputText>
+ <h:inputText value="#{listShuttle.first}" onchange="submit()" />
<h:outputText value="showButtonLabels" />
<h:selectBooleanCheckbox value="#{listShuttle.showButtonLabels}"
@@ -114,71 +124,56 @@
onchange="submit();" />
<h:outputText value="sourceCaptionLabel" />
- <h:inputText value="#{listShuttle.sourceCaptionLabel}">
- <a4j:support event="onclick" reRender="listShuttleID"></a4j:support>
- </h:inputText>
+ <h:inputText value="#{listShuttle.sourceCaptionLabel}"
+ onchange="submit()" />
<h:outputText value="targetCaptionLabel" />
- <h:inputText value="#{listShuttle.targetCaptionLabel}">
- <a4j:support event="onclick" reRender="listShuttleID"></a4j:support>
- </h:inputText>
+ <h:inputText value="#{listShuttle.targetCaptionLabel}"
+ onchange="submit()" />
<h:outputText value="sourceListWidth" />
- <h:inputText value="#{listShuttle.sourceListWidth}">
- <a4j:support event="onclick" reRender="listShuttleID"></a4j:support>
- </h:inputText>
+ <h:inputText value="#{listShuttle.sourceListWidth}"
+ onchange="submit()" />
<h:outputText value="targetListWidth" />
- <h:inputText value="#{listShuttle.targetListWidth}">
- <a4j:support event="onclick" reRender="listShuttleID"></a4j:support>
- </h:inputText>
+ <h:inputText value="#{listShuttle.targetListWidth}"
+ onchange="submit()" />
<h:outputText value="listsHeight" />
- <h:inputText value="#{listShuttle.listsHeight}">
- <a4j:support event="onclick" reRender="listShuttleID"></a4j:support>
- </h:inputText>
+ <h:inputText value="#{listShuttle.listsHeight}" onchange="submit()" />
<h:outputText value="copyControlLabel" />
- <h:inputText value="#{listShuttle.copyControlLabel}">
- <a4j:support event="onclick" reRender="listShuttleID"></a4j:support>
- </h:inputText>
+ <h:inputText value="#{listShuttle.copyControlLabel}"
+ onchange="submit()" />
<h:outputText value="removeControlLabel" />
- <h:inputText value="#{listShuttle.removeControlLabel}">
- <a4j:support event="onclick" reRender="listShuttleID"></a4j:support>
- </h:inputText>
+ <h:inputText value="#{listShuttle.removeControlLabel}"
+ onchange="submit()" />
<h:outputText value="copyAllControlLabel" />
- <h:inputText value="#{listShuttle.copyAllControlLabel}">
- <a4j:support event="onclick" reRender="listShuttleID"></a4j:support>
- </h:inputText>
+ <h:inputText value="#{listShuttle.copyAllControlLabel}"
+ onchange="submit()" />
<h:outputText value="removeAllControlLabel" />
- <h:inputText value="#{listShuttle.removeAllControlLabel}">
- <a4j:support event="onclick" reRender="listShuttleID"></a4j:support>
- </h:inputText>
+ <h:inputText value="#{listShuttle.removeAllControlLabel}"
+ onchange="submit()" />
<h:outputText value="bottomControlLabel" />
- <h:inputText value="#{listShuttle.bottomControlLabel}">
- <a4j:support event="onclick" reRender="listShuttleID"></a4j:support>
- </h:inputText>
+ <h:inputText value="#{listShuttle.bottomControlLabel}"
+ onchange="submit()" />
<h:outputText value="downControlLabel" />
- <h:inputText value="#{listShuttle.downControlLabel}">
- <a4j:support event="onclick" reRender="listShuttleID"></a4j:support>
- </h:inputText>
+ <h:inputText value="#{listShuttle.downControlLabel}"
+ onchange="submit()" />
<h:outputText value="topControlLabel" />
- <h:inputText value="#{listShuttle.topControlLabel}">
- <a4j:support event="onclick" reRender="listShuttleID"></a4j:support>
- </h:inputText>
+ <h:inputText value="#{listShuttle.topControlLabel}"
+ onchange="submit()" />
<h:outputText value="upControlLabel" />
- <h:inputText value="#{listShuttle.upControlLabel}">
- <a4j:support event="onclick" reRender="listShuttleID"></a4j:support>
- </h:inputText>
+ <h:inputText value="#{listShuttle.upControlLabel}" onchange="submit()" />
</h:panelGrid>
-
+
<br />
<br />
<!-- <div style="FONT-WEIGHT: bold;">rich:findComponent</div>
Modified: trunk/test-applications/facelets/src/main/webapp/ListShuttle/ListShuttleStraightforward.xhtml
===================================================================
--- trunk/test-applications/facelets/src/main/webapp/ListShuttle/ListShuttleStraightforward.xhtml 2008-10-21 15:43:06 UTC (rev 10855)
+++ trunk/test-applications/facelets/src/main/webapp/ListShuttle/ListShuttleStraightforward.xhtml 2008-10-21 16:43:03 UTC (rev 10856)
@@ -1,27 +1,39 @@
-<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="listShuttleStraightforwardSubviewID">
+<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="listShuttleStraightforwardSubviewID">
<h:panelGrid columns="3">
- <a4j:commandButton value="Show selection (reRender)" reRender="infoLSID"></a4j:commandButton>
+ <a4j:commandButton value="Show selection (reRender)"
+ reRender="infoLSID"></a4j:commandButton>
<h:column>
- <h:selectBooleanCheckbox value="#{listShuttle.showSelect}" onclick="submit();" />
+ <h:selectBooleanCheckbox value="#{listShuttle.showSelect}"
+ onclick="submit();" />
</h:column>
<h:column>
- <h:dataTable id="infoLSID" value="#{listShuttle.info}" var="info" rendered="#{listShuttle.showSelect}" border="1">
+ <h:dataTable id="infoLSID" value="#{listShuttle.info}" var="info"
+ rendered="#{listShuttle.showSelect}" border="1">
<h:column>
<h:outputText value="#{info}" />
</h:column>
</h:dataTable>
</h:column>
- <a4j:commandButton value="Show all source (reRender)" reRender="allInfoLSSourceID"></a4j:commandButton>
+ <a4j:commandButton value="Show all source (reRender)"
+ reRender="allInfoLSSourceID"></a4j:commandButton>
<h:column>
- <h:selectBooleanCheckbox value="#{listShuttle.showAllSourceData}" onclick="submit();" />
+ <h:selectBooleanCheckbox value="#{listShuttle.showAllSourceData}"
+ onclick="submit();" />
</h:column>
<h:column>
- <h:dataTable id="allInfoLSSourceID" value="#{listShuttle.sourceValue}" var="allInfo" rendered="#{listShuttle.showAllSourceData}" border="1">
+ <h:dataTable id="allInfoLSSourceID"
+ value="#{listShuttle.sourceValue}" var="allInfo"
+ rendered="#{listShuttle.showAllSourceData}" border="1">
<h:column>
<f:facet name="header">
- <h:outputText value="Number" />
+ <h:outputText value="Output" />
</f:facet>
<h:outputText value="#{allInfo.int0}" />
</h:column>
@@ -30,7 +42,7 @@
<f:facet name="header">
<h:outputText value="Input" />
</f:facet>
- <h:outputText value="#{allInfo.str0}" />
+ <h:outputText value="#{allInfo.str4}" />
</h:column>
<h:column>
@@ -42,50 +54,40 @@
<h:column>
<f:facet name="header">
- <h:outputText value="Input" />
+ <h:outputText value="a4jLink" />
</f:facet>
- <h:outputText value="#{allInfo.str1}" />
+ <h:outputText value="#{allInfo.str1} a4j" />
</h:column>
<h:column>
<f:facet name="header">
- <h:outputText value="Link" />
+ <h:outputText value="Select" />
</f:facet>
- <h:outputText value="#{allInfo.str1} submit()" />
- </h:column>
-
- <h:column>
- <f:facet name="header">
- <h:outputText value="select" />
- </f:facet>
<h:outputText value="#{allInfo.str2}" />
</h:column>
<h:column>
<f:facet name="header">
- <h:outputText value="Text" />
+ <h:outputText value="GraphicImage" />
</f:facet>
<h:outputText value="#{allInfo.str3}" />
</h:column>
-
- <h:column>
- <f:facet name="header">
- <h:outputText value="graphicImage" />
- </f:facet>
- <h:outputText value="#{allInfo.str3}" />
- </h:column>
</h:dataTable>
</h:column>
- <a4j:commandButton value="Show all target (reRender)" reRender="allInfoLSTargetID"></a4j:commandButton>
+ <a4j:commandButton value="Show all target (reRender)"
+ reRender="allInfoLSTargetID"></a4j:commandButton>
<h:column>
- <h:selectBooleanCheckbox value="#{listShuttle.showAllTargetData}" onclick="submit();" />
+ <h:selectBooleanCheckbox value="#{listShuttle.showAllTargetData}"
+ onclick="submit();" />
</h:column>
<h:column>
- <h:dataTable id="allInfoLSTargetID" value="#{listShuttle.targetValue}" var="allInfo" rendered="#{listShuttle.showAllTargetData}" border="1">
+ <h:dataTable id="allInfoLSTargetID"
+ value="#{listShuttle.targetValue}" var="allInfo"
+ rendered="#{listShuttle.showAllTargetData}" border="1">
<h:column>
<f:facet name="header">
- <h:outputText value="Number" />
+ <h:outputText value="Output" />
</f:facet>
<h:outputText value="#{allInfo.int0}" />
</h:column>
@@ -94,7 +96,7 @@
<f:facet name="header">
<h:outputText value="Input" />
</f:facet>
- <h:outputText value="#{allInfo.str0}" />
+ <h:outputText value="#{allInfo.str4}" />
</h:column>
<h:column>
@@ -106,38 +108,24 @@
<h:column>
<f:facet name="header">
- <h:outputText value="Input" />
+ <h:outputText value="a4jLink" />
</f:facet>
- <h:outputText value="#{allInfo.str1}" />
+ <h:outputText value="#{allInfo.str1} a4j" />
</h:column>
<h:column>
<f:facet name="header">
- <h:outputText value="Link" />
+ <h:outputText value="Select" />
</f:facet>
- <h:outputText value="#{allInfo.str1} submit()" />
- </h:column>
-
- <h:column>
- <f:facet name="header">
- <h:outputText value="select" />
- </f:facet>
<h:outputText value="#{allInfo.str2}" />
</h:column>
<h:column>
<f:facet name="header">
- <h:outputText value="Text" />
+ <h:outputText value="GraphicImage" />
</f:facet>
<h:outputText value="#{allInfo.str3}" />
</h:column>
-
- <h:column>
- <f:facet name="header">
- <h:outputText value="graphicImage" />
- </f:facet>
- <h:outputText value="#{allInfo.str3}" />
- </h:column>
</h:dataTable>
</h:column>
</h:panelGrid>
17 years, 2 months