Author: sdzmitrovich
Date: 2008-09-19 12:42:21 -0400 (Fri, 19 Sep 2008)
New Revision: 10382
Added:
trunk/jsf/tests/org.jboss.tools.jsf.vpe.jsf.test/resources/jsfTest/WebContent/pages/components/Copy
of selectOneMenu.jsp.xml
trunk/jsf/tests/org.jboss.tools.jsf.vpe.jsf.test/resources/jsfTest/WebContent/pages/components/outputLabel.jsp.xml
trunk/jsf/tests/org.jboss.tools.jsf.vpe.jsf.test/resources/jsfTest/WebContent/pages/components/outputText.jsp.xml
trunk/jsf/tests/org.jboss.tools.jsf.vpe.jsf.test/resources/jsfTest/WebContent/pages/components/panelGrid.jsp.xml
trunk/jsf/tests/org.jboss.tools.jsf.vpe.jsf.test/resources/jsfTest/WebContent/pages/components/panelGroup.jsp.xml
trunk/jsf/tests/org.jboss.tools.jsf.vpe.jsf.test/resources/jsfTest/WebContent/pages/components/selectBooleanCheckbox.jsp.xml
trunk/jsf/tests/org.jboss.tools.jsf.vpe.jsf.test/resources/jsfTest/WebContent/pages/components/selectManyCheckbox.jsp.xml
trunk/jsf/tests/org.jboss.tools.jsf.vpe.jsf.test/resources/jsfTest/WebContent/pages/components/selectManyListbox.jsp.xml
trunk/jsf/tests/org.jboss.tools.jsf.vpe.jsf.test/resources/jsfTest/WebContent/pages/components/selectManyMenu.jsp.xml
trunk/jsf/tests/org.jboss.tools.jsf.vpe.jsf.test/resources/jsfTest/WebContent/pages/components/selectOneListbox.jsp.xml
trunk/jsf/tests/org.jboss.tools.jsf.vpe.jsf.test/resources/jsfTest/WebContent/pages/components/selectOneMenu.jsp.xml
Modified:
trunk/jsf/plugins/org.jboss.tools.jsf.vpe.jsf/src/org/jboss/tools/jsf/vpe/jsf/template/JsfSelectManyCheckbox.java
trunk/jsf/plugins/org.jboss.tools.jsf.vpe.jsf/src/org/jboss/tools/jsf/vpe/jsf/template/JsfSelectManyListbox.java
trunk/jsf/plugins/org.jboss.tools.jsf.vpe.jsf/src/org/jboss/tools/jsf/vpe/jsf/template/JsfSelectOneListbox.java
trunk/jsf/plugins/org.jboss.tools.jsf.vpe.jsf/src/org/jboss/tools/jsf/vpe/jsf/template/JsfSelectOneMenuTemplate.java
trunk/jsf/plugins/org.jboss.tools.jsf.vpe.jsf/src/org/jboss/tools/jsf/vpe/jsf/template/util/JSF.java
trunk/jsf/tests/org.jboss.tools.jsf.vpe.jsf.test/resources/jsfTest/WebContent/pages/components/outputFormat.jsp
trunk/jsf/tests/org.jboss.tools.jsf.vpe.jsf.test/resources/jsfTest/WebContent/pages/components/outputFormat.jsp.xml
trunk/jsf/tests/org.jboss.tools.jsf.vpe.jsf.test/resources/jsfTest/WebContent/pages/components/outputLabel.jsp
trunk/jsf/tests/org.jboss.tools.jsf.vpe.jsf.test/resources/jsfTest/WebContent/pages/components/outputText.jsp
trunk/jsf/tests/org.jboss.tools.jsf.vpe.jsf.test/resources/jsfTest/WebContent/pages/components/panelGrid.jsp
trunk/jsf/tests/org.jboss.tools.jsf.vpe.jsf.test/resources/jsfTest/WebContent/pages/components/panelGroup.jsp
trunk/jsf/tests/org.jboss.tools.jsf.vpe.jsf.test/resources/jsfTest/WebContent/pages/components/selectBooleanCheckbox.jsp
trunk/jsf/tests/org.jboss.tools.jsf.vpe.jsf.test/resources/jsfTest/WebContent/pages/components/selectManyCheckbox.jsp
trunk/jsf/tests/org.jboss.tools.jsf.vpe.jsf.test/resources/jsfTest/WebContent/pages/components/selectManyListbox.jsp
trunk/jsf/tests/org.jboss.tools.jsf.vpe.jsf.test/resources/jsfTest/WebContent/pages/components/selectManyMenu.jsp
trunk/jsf/tests/org.jboss.tools.jsf.vpe.jsf.test/resources/jsfTest/WebContent/pages/components/selectOneListbox.jsp
trunk/jsf/tests/org.jboss.tools.jsf.vpe.jsf.test/resources/jsfTest/WebContent/pages/components/selectOneMenu.jsp
trunk/jsf/tests/org.jboss.tools.jsf.vpe.jsf.test/src/org/jboss/tools/jsf/vpe/jsf/test/JsfComponentContentTest.java
Log:
https://jira.jboss.org/jira/browse/JBIDE-2781
Modified:
trunk/jsf/plugins/org.jboss.tools.jsf.vpe.jsf/src/org/jboss/tools/jsf/vpe/jsf/template/JsfSelectManyCheckbox.java
===================================================================
---
trunk/jsf/plugins/org.jboss.tools.jsf.vpe.jsf/src/org/jboss/tools/jsf/vpe/jsf/template/JsfSelectManyCheckbox.java 2008-09-19
13:16:24 UTC (rev 10381)
+++
trunk/jsf/plugins/org.jboss.tools.jsf.vpe.jsf/src/org/jboss/tools/jsf/vpe/jsf/template/JsfSelectManyCheckbox.java 2008-09-19
16:42:21 UTC (rev 10382)
@@ -1,18 +1,19 @@
/*******************************************************************************
- * Copyright (c) 2007-2008 Red Hat, Inc.
- * Distributed under license by Red Hat, Inc. All rights reserved.
- * This program is made available under the terms of the
- * Eclipse Public License v1.0 which accompanies this distribution,
- * and is available at
http://www.eclipse.org/legal/epl-v10.html
- *
- * Contributor:
- * Red Hat, Inc. - initial API and implementation
- ******************************************************************************/
+ * Copyright (c) 2007-2008 Red Hat, Inc.
+ * Distributed under license by Red Hat, Inc. All rights reserved.
+ * This program is made available under the terms of the
+ * Eclipse Public License v1.0 which accompanies this distribution,
+ * and is available at
http://www.eclipse.org/legal/epl-v10.html
+ *
+ * Contributor:
+ * Red Hat, Inc. - initial API and implementation
+ ******************************************************************************/
package org.jboss.tools.jsf.vpe.jsf.template;
import java.util.ArrayList;
import java.util.List;
+import org.jboss.tools.jsf.vpe.jsf.template.util.JSF;
import org.jboss.tools.vpe.editor.context.VpePageContext;
import org.jboss.tools.vpe.editor.template.VpeAbstractTemplate;
import org.jboss.tools.vpe.editor.template.VpeChildrenInfo;
@@ -26,35 +27,31 @@
/**
* @author dmaliarevich
- *
+ *
*/
public class JsfSelectManyCheckbox extends VpeAbstractTemplate {
- private static final String PAGE_DIRECTION = "pageDirection";
- private static final String LINE_DIRECTION = "lineDirection";
-
- /*h:SelectManyCheckbox attributes*/
- private static final String STYLE = "style";
- private static final String STYLE_CLASS = "styleClass";
- private static final String BORDER = "border";
- private static final String LAYOUT = "layout";
- private static final String CLASS = "class";
-
+ private static final String PAGE_DIRECTION = "pageDirection"; //$NON-NLS-1$
+ private static final String LINE_DIRECTION = "lineDirection"; //$NON-NLS-1$
+
+ /* h:SelectManyCheckbox attributes */
+ private static final String BORDER = "border"; //$NON-NLS-1$
+
private String style;
private String styleClass;
private String border;
private String layout;
-
+
/**
* list of visible children
*/
private static List<String> CHILDREN_LIST = new ArrayList<String>();
static {
- CHILDREN_LIST.add("selectItem"); //$NON-NLS-1$
- CHILDREN_LIST.add("selectItems"); //$NON-NLS-1$
+ CHILDREN_LIST.add(JSF.TAG_SELECT_ITEM);
+ CHILDREN_LIST.add(JSF.TAG_SELECT_ITEMS);
}
-
+
/**
*
*/
@@ -64,8 +61,10 @@
/*
* (non-Javadoc)
*
- * @see
org.jboss.tools.vpe.editor.template.VpeTemplate#create(org.jboss.tools.vpe.editor.context.VpePageContext,
- * org.w3c.dom.Node, org.mozilla.interfaces.nsIDOMDocument)
+ * @see
+ * org.jboss.tools.vpe.editor.template.VpeTemplate#create(org.jboss.tools
+ * .vpe.editor.context.VpePageContext, org.w3c.dom.Node,
+ * org.mozilla.interfaces.nsIDOMDocument)
*/
public VpeCreationData create(VpePageContext pageContext, Node sourceNode,
nsIDOMDocument visualDocument) {
@@ -78,10 +77,10 @@
nsIDOMElement td = null;
if (attrPresents(style)) {
- table.setAttribute(STYLE, style);
+ table.setAttribute(HTML.ATTR_STYLE, style);
}
if (attrPresents(styleClass)) {
- table.setAttribute(CLASS, styleClass);
+ table.setAttribute(HTML.ATTR_CLASS, styleClass);
}
if (attrPresents(border)) {
table.setAttribute(BORDER, border);
@@ -123,7 +122,7 @@
return creationData;
}
-
+
/**
* Read attributes from the source element.
*
@@ -132,21 +131,22 @@
*/
private void readAttributes(Node sourceNode) {
Element source = (Element) sourceNode;
- style = source.getAttribute(STYLE);
- styleClass = source.getAttribute(STYLE_CLASS);
+ style = source.getAttribute(JSF.ATTR_STYLE);
+ styleClass = source.getAttribute(JSF.ATTR_STYLE_CLASS);
border = source.getAttribute(BORDER);
- layout = source.getAttribute(LAYOUT);
+ layout = source.getAttribute(JSF.ATTR_LAYOUT);
}
- /**
- * Checks is attribute presents.
- *
- * @param attr the attribute
- *
- * @return true, if successful
- */
- private boolean attrPresents(String attr) {
- return ((null != attr) && (!"".equals(attr)));
+ /**
+ * Checks is attribute presents.
+ *
+ * @param attr
+ * the attribute
+ *
+ * @return true, if successful
+ */
+ private boolean attrPresents(String attr) {
+ return ((null != attr) && (attr.length() != 0));
}
}
Modified:
trunk/jsf/plugins/org.jboss.tools.jsf.vpe.jsf/src/org/jboss/tools/jsf/vpe/jsf/template/JsfSelectManyListbox.java
===================================================================
---
trunk/jsf/plugins/org.jboss.tools.jsf.vpe.jsf/src/org/jboss/tools/jsf/vpe/jsf/template/JsfSelectManyListbox.java 2008-09-19
13:16:24 UTC (rev 10381)
+++
trunk/jsf/plugins/org.jboss.tools.jsf.vpe.jsf/src/org/jboss/tools/jsf/vpe/jsf/template/JsfSelectManyListbox.java 2008-09-19
16:42:21 UTC (rev 10382)
@@ -1,18 +1,19 @@
/*******************************************************************************
-* Copyright (c) 2007 Red Hat, Inc.
-* Distributed under license by Red Hat, Inc. All rights reserved.
-* This program is made available under the terms of the
-* Eclipse Public License v1.0 which accompanies this distribution,
-* and is available at
http://www.eclipse.org/legal/epl-v10.html
-*
-* Contributors:
-* Red Hat, Inc. - initial API and implementation
-******************************************************************************/
+ * Copyright (c) 2007 Red Hat, Inc.
+ * Distributed under license by Red Hat, Inc. All rights reserved.
+ * This program is made available under the terms of the
+ * Eclipse Public License v1.0 which accompanies this distribution,
+ * and is available at
http://www.eclipse.org/legal/epl-v10.html
+ *
+ * Contributors:
+ * Red Hat, Inc. - initial API and implementation
+ ******************************************************************************/
package org.jboss.tools.jsf.vpe.jsf.template;
import java.util.ArrayList;
import java.util.List;
+import org.jboss.tools.jsf.vpe.jsf.template.util.JSF;
import org.jboss.tools.vpe.editor.context.VpePageContext;
import org.jboss.tools.vpe.editor.template.VpeAbstractTemplate;
import org.jboss.tools.vpe.editor.template.VpeCreationData;
@@ -27,24 +28,11 @@
/**
* @author Sergey Dzmitrovich
*
- * template for selectOneListbox select item
+ * template for selectOneListbox select item
*
*/
public class JsfSelectManyListbox extends VpeAbstractTemplate {
- /**
- * "size" attribute
- */
- private static final String ATTR_SIZE = "size"; //$NON-NLS-1$
-
- /**
- * "dir" attribute
- */
- private static final String ATTR_DIR = "dir";
-
- /**
- * "size" attribute
- */
private static final String ATTR_MULTIPLE_VALUE = "multiple"; //$NON-NLS-1$
/**
* list of visible children
@@ -52,8 +40,8 @@
private static List<String> CHILDREN_LIST = new ArrayList<String>();
static {
- CHILDREN_LIST.add("selectItem"); //$NON-NLS-1$
- CHILDREN_LIST.add("selectItems"); //$NON-NLS-1$
+ CHILDREN_LIST.add(JSF.TAG_SELECT_ITEM);
+ CHILDREN_LIST.add(JSF.TAG_SELECT_ITEMS);
}
/**
@@ -77,8 +65,10 @@
/*
* (non-Javadoc)
*
- * @see
org.jboss.tools.vpe.editor.template.VpeTemplate#create(org.jboss.tools.vpe.editor.context.VpePageContext,
- * org.w3c.dom.Node, org.mozilla.interfaces.nsIDOMDocument)
+ * @see
+ * org.jboss.tools.vpe.editor.template.VpeTemplate#create(org.jboss.tools
+ * .vpe.editor.context.VpePageContext, org.w3c.dom.Node,
+ * org.mozilla.interfaces.nsIDOMDocument)
*/
public VpeCreationData create(VpePageContext pageContext, Node sourceNode,
nsIDOMDocument visualDocument) {
@@ -104,15 +94,15 @@
select.setAttribute(HTML.ATTR_MULTIPLE, ATTR_MULTIPLE_VALUE);
// get "size" attribute
- String size = element.getAttribute(ATTR_SIZE);
+ String size = element.getAttribute(JSF.ATTR_SIZE);
// get "dir" attribute
- String dir = element.getAttribute(ATTR_DIR);
-
+ String dir = element.getAttribute(JSF.ATTR_DIR);
+
if (null != dir) {
select.setAttribute(HTML.ATTR_DIR, dir);
}
-
+
// add "size" attribute to "select"
if (size != null)
// if source has "size" attribute import it
Modified:
trunk/jsf/plugins/org.jboss.tools.jsf.vpe.jsf/src/org/jboss/tools/jsf/vpe/jsf/template/JsfSelectOneListbox.java
===================================================================
---
trunk/jsf/plugins/org.jboss.tools.jsf.vpe.jsf/src/org/jboss/tools/jsf/vpe/jsf/template/JsfSelectOneListbox.java 2008-09-19
13:16:24 UTC (rev 10381)
+++
trunk/jsf/plugins/org.jboss.tools.jsf.vpe.jsf/src/org/jboss/tools/jsf/vpe/jsf/template/JsfSelectOneListbox.java 2008-09-19
16:42:21 UTC (rev 10382)
@@ -17,6 +17,7 @@
import java.util.Set;
import org.jboss.tools.jsf.vpe.jsf.template.util.ComponentUtil;
+import org.jboss.tools.jsf.vpe.jsf.template.util.JSF;
import org.jboss.tools.vpe.editor.context.VpePageContext;
import org.jboss.tools.vpe.editor.template.VpeAbstractTemplate;
import org.jboss.tools.vpe.editor.template.VpeCreationData;
@@ -33,27 +34,19 @@
/**
* @author Sergey Dzmitrovich
*
- * template for selectOneListbox select item
+ * template for selectOneListbox select item
*
*/
public class JsfSelectOneListbox extends VpeAbstractTemplate {
/**
- * "size" attribute
- */
- private static final String ATTR_SIZE = "size"; //$NON-NLS-1$
-
- private static final String ATTR_DISABLED_CLASS = "disabledClass";
- private static final String ATTR_ENABLED_CLASS = "enabledClass";
-
- /**
* list of visible children
*/
private static List<String> CHILDREN_LIST = new ArrayList<String>();
static {
- CHILDREN_LIST.add("selectItem"); //$NON-NLS-1$
- CHILDREN_LIST.add("selectItems"); //$NON-NLS-1$
+ CHILDREN_LIST.add(JSF.TAG_SELECT_ITEM);
+ CHILDREN_LIST.add(JSF.TAG_SELECT_ITEMS);
}
/**
@@ -62,10 +55,10 @@
private static Map<String, String> ATTR_LIST_COPY = new HashMap<String,
String>();
static {
- ATTR_LIST_COPY.put("style", "style"); //$NON-NLS-1$
- ATTR_LIST_COPY.put("styleClass", "class"); //$NON-NLS-1$
- ATTR_LIST_COPY.put("disabled", "disabled"); //$NON-NLS-1$
- ATTR_LIST_COPY.put("dir", "dir"); //$NON-NLS-1$
+ ATTR_LIST_COPY.put(JSF.ATTR_STYLE, HTML.ATTR_STYLE);
+ ATTR_LIST_COPY.put(JSF.ATTR_STYLE_CLASS, HTML.ATTR_CLASS);
+ ATTR_LIST_COPY.put(JSF.ATTR_DISABLED, HTML.ATTR_DISABLED);
+ ATTR_LIST_COPY.put(JSF.ATTR_DIR, HTML.ATTR_DIR);
}
/**
@@ -79,8 +72,10 @@
/*
* (non-Javadoc)
*
- * @see
org.jboss.tools.vpe.editor.template.VpeTemplate#create(org.jboss.tools.vpe.editor.context.VpePageContext,
- * org.w3c.dom.Node, org.mozilla.interfaces.nsIDOMDocument)
+ * @see
+ * org.jboss.tools.vpe.editor.template.VpeTemplate#create(org.jboss.tools
+ * .vpe.editor.context.VpePageContext, org.w3c.dom.Node,
+ * org.mozilla.interfaces.nsIDOMDocument)
*/
public VpeCreationData create(VpePageContext pageContext, Node sourceNode,
nsIDOMDocument visualDocument) {
@@ -114,7 +109,7 @@
}
// get "size" attribute
- String size = element.getAttribute(ATTR_SIZE);
+ String size = element.getAttribute(JSF.ATTR_SIZE);
// add "size" attribute to "select"
if (size != null)
@@ -190,21 +185,22 @@
element
.setAttribute(HTML.ATTR_DISABLED,
HTML.ATTR_DISABLED);
- element.setAttribute(HTML.ATTR_STYLE, sourceElement.getAttribute(HTML.ATTR_STYLE));
+ element.setAttribute(HTML.ATTR_STYLE, sourceElement
+ .getAttribute(HTML.ATTR_STYLE));
}
- element
- .setAttribute(
- HTML.ATTR_CLASS,
- (disabled || ComponentUtil
- .string2boolean(ComponentUtil
- .getAttribute(element,
- HTML.ATTR_DISABLED))) ? ComponentUtil
- .getAttribute(sourceElement,
- ATTR_DISABLED_CLASS)
- : ComponentUtil.getAttribute(
- sourceElement,
- ATTR_ENABLED_CLASS));
-
+ element
+ .setAttribute(
+ HTML.ATTR_CLASS,
+ (disabled || ComponentUtil
+ .string2boolean(ComponentUtil
+ .getAttribute(element,
+ HTML.ATTR_DISABLED))) ? ComponentUtil
+ .getAttribute(sourceElement,
+ JSF.ATTR_DISABLED_CLASS)
+ : ComponentUtil.getAttribute(
+ sourceElement,
+ JSF.ATTR_ENABLED_CLASS));
+
}
for (int i = 0; i < list.getLength(); i++) {
applyChildAttributes(sourceElement, list.item(i));
Modified:
trunk/jsf/plugins/org.jboss.tools.jsf.vpe.jsf/src/org/jboss/tools/jsf/vpe/jsf/template/JsfSelectOneMenuTemplate.java
===================================================================
---
trunk/jsf/plugins/org.jboss.tools.jsf.vpe.jsf/src/org/jboss/tools/jsf/vpe/jsf/template/JsfSelectOneMenuTemplate.java 2008-09-19
13:16:24 UTC (rev 10381)
+++
trunk/jsf/plugins/org.jboss.tools.jsf.vpe.jsf/src/org/jboss/tools/jsf/vpe/jsf/template/JsfSelectOneMenuTemplate.java 2008-09-19
16:42:21 UTC (rev 10382)
@@ -17,9 +17,11 @@
import java.util.Set;
import org.jboss.tools.jsf.vpe.jsf.template.util.ComponentUtil;
+import org.jboss.tools.jsf.vpe.jsf.template.util.JSF;
import org.jboss.tools.vpe.editor.context.VpePageContext;
import org.jboss.tools.vpe.editor.template.VpeAbstractTemplate;
import org.jboss.tools.vpe.editor.template.VpeCreationData;
+import org.jboss.tools.vpe.editor.util.Constants;
import org.jboss.tools.vpe.editor.util.HTML;
import org.mozilla.interfaces.nsIDOMDocument;
import org.mozilla.interfaces.nsIDOMElement;
@@ -38,20 +40,13 @@
public class JsfSelectOneMenuTemplate extends VpeAbstractTemplate {
/**
- * "size" attribute
- */
-
- private static final String ATTR_DISABLED_CLASS = "disabledClass";
- private static final String ATTR_ENABLED_CLASS = "enabledClass";
-
- /**
* list of visible children
*/
private static List<String> CHILDREN_LIST = new ArrayList<String>();
static {
- CHILDREN_LIST.add("selectItem"); //$NON-NLS-1$
- CHILDREN_LIST.add("selectItems"); //$NON-NLS-1$
+ CHILDREN_LIST.add(JSF.TAG_SELECT_ITEM);
+ CHILDREN_LIST.add(JSF.TAG_SELECT_ITEMS);
}
/**
@@ -60,11 +55,10 @@
private static Map<String, String> ATTR_LIST_COPY = new HashMap<String,
String>();
static {
- ATTR_LIST_COPY.put("style", "style"); //$NON-NLS-1$
- ATTR_LIST_COPY.put("styleClass", "class"); //$NON-NLS-1$
- ATTR_LIST_COPY.put("disabled", "disabled"); //$NON-NLS-1$
- ATTR_LIST_COPY.put("dir", "dir"); //$NON-NLS-1$
-
+ ATTR_LIST_COPY.put(JSF.ATTR_STYLE, HTML.ATTR_STYLE);
+ ATTR_LIST_COPY.put(JSF.ATTR_STYLE_CLASS, HTML.ATTR_CLASS);
+ ATTR_LIST_COPY.put(JSF.ATTR_DISABLED, HTML.ATTR_DISABLED);
+ ATTR_LIST_COPY.put(JSF.ATTR_DIR, HTML.ATTR_DIR);
}
/**
@@ -86,7 +80,7 @@
// create select element
nsIDOMElement select = visualDocument.createElement(HTML.TAG_SELECT);
- select.setAttribute(HTML.ATTR_SIZE, "1");
+ select.setAttribute(HTML.ATTR_SIZE, "1"); //$NON-NLS-1$
Element element = (Element) sourceNode;
// import attributes from source
@@ -100,9 +94,9 @@
// add attribute to "select"
if (attr != null) {
if (attributeName.equalsIgnoreCase(HTML.ATTR_DISABLED)) {
- if (attr.equalsIgnoreCase("true")) {
+ if (attr.equalsIgnoreCase(Constants.TRUE)) {
select.setAttribute(ATTR_LIST_COPY.get(attributeName),
- "disabled");
+ "disabled"); //$NON-NLS-1$
}
continue;
@@ -148,9 +142,9 @@
sourceElement, HTML.ATTR_DISABLED));
if (node.getNodeName().equalsIgnoreCase(HTML.TAG_OPTION)) {
element.setAttribute(HTML.ATTR_CLASS, disabled ? ComponentUtil
- .getAttribute(sourceElement, ATTR_DISABLED_CLASS)
+ .getAttribute(sourceElement, JSF.ATTR_DISABLED_CLASS)
: ComponentUtil.getAttribute(sourceElement,
- ATTR_ENABLED_CLASS));
+ JSF.ATTR_ENABLED_CLASS));
}
for (int i = 0; i < list.getLength(); i++) {
applyChildAttributes(sourceElement, list.item(i));
Modified:
trunk/jsf/plugins/org.jboss.tools.jsf.vpe.jsf/src/org/jboss/tools/jsf/vpe/jsf/template/util/JSF.java
===================================================================
---
trunk/jsf/plugins/org.jboss.tools.jsf.vpe.jsf/src/org/jboss/tools/jsf/vpe/jsf/template/util/JSF.java 2008-09-19
13:16:24 UTC (rev 10381)
+++
trunk/jsf/plugins/org.jboss.tools.jsf.vpe.jsf/src/org/jboss/tools/jsf/vpe/jsf/template/util/JSF.java 2008-09-19
16:42:21 UTC (rev 10382)
@@ -17,6 +17,10 @@
*/
public class JSF {
+ public static final String TAG_SELECT_ITEM = "selectItem"; //$NON-NLS-1$
+
+ public static final String TAG_SELECT_ITEMS = "selectItems"; //$NON-NLS-1$
+
public static final String TAG_PARAM = "param"; //$NON-NLS-1$
public static final String ATTR_VALUE = "value"; //$NON-NLS-1$
@@ -39,12 +43,16 @@
public static final String ATTR_STYLE_CLASS = "styleClass"; //$NON-NLS-1$
+ public static final String ATTR_STYLE = "style"; //$NON-NLS-1$
+
public static final String ATTR_SIZE = "size"; //$NON-NLS-1$
public static final String ATTR_ROWS = "rows"; //$NON-NLS-1$
public static final String ATTR_COLS = "cols"; //$NON-NLS-1$
-
+
public static final String ATTR_ITEM_DISABLED = "itemDisabled"; //$NON-NLS-1$
+ public static final String ATTR_LAYOUT = "layout";//$NON-NLS-1$
+
}
Added:
trunk/jsf/tests/org.jboss.tools.jsf.vpe.jsf.test/resources/jsfTest/WebContent/pages/components/Copy
of selectOneMenu.jsp.xml
===================================================================
---
trunk/jsf/tests/org.jboss.tools.jsf.vpe.jsf.test/resources/jsfTest/WebContent/pages/components/Copy
of selectOneMenu.jsp.xml (rev 0)
+++
trunk/jsf/tests/org.jboss.tools.jsf.vpe.jsf.test/resources/jsfTest/WebContent/pages/components/Copy
of selectOneMenu.jsp.xml 2008-09-19 16:42:21 UTC (rev 10382)
@@ -0,0 +1,9 @@
+<tests>
+ <test id="selectOneListbox">
+ <SELECT SIZE="3">
+ <OPTION> value1</OPTION>
+ <OPTION> value2</OPTION>
+ <OPTION> value3</OPTION>
+ </SELECT>
+ </test>
+</tests>
\ No newline at end of file
Modified:
trunk/jsf/tests/org.jboss.tools.jsf.vpe.jsf.test/resources/jsfTest/WebContent/pages/components/outputFormat.jsp
===================================================================
---
trunk/jsf/tests/org.jboss.tools.jsf.vpe.jsf.test/resources/jsfTest/WebContent/pages/components/outputFormat.jsp 2008-09-19
13:16:24 UTC (rev 10381)
+++
trunk/jsf/tests/org.jboss.tools.jsf.vpe.jsf.test/resources/jsfTest/WebContent/pages/components/outputFormat.jsp 2008-09-19
16:42:21 UTC (rev 10382)
@@ -9,7 +9,13 @@
<f:view>
<h1><h:outputText value="outputFormat" /></h1>
- <h:outputFormat value="outputFormat" />
+ <h:outputFormat value="outputFormat1" id="outputFormat1" />
+ <h:outputFormat escape="true" value="outputFormat2"
id="outputFormat2" />
+ <h:outputFormat escape="false" value="outputFormat3"
id="outputFormat3" />
+ <h:outputFormat value="{0}" id="outputFormat4">
+ <f:param value="outputFormat4" />
+ </h:outputFormat>
+
</f:view>
</body>
</html>
\ No newline at end of file
Modified:
trunk/jsf/tests/org.jboss.tools.jsf.vpe.jsf.test/resources/jsfTest/WebContent/pages/components/outputFormat.jsp.xml
===================================================================
---
trunk/jsf/tests/org.jboss.tools.jsf.vpe.jsf.test/resources/jsfTest/WebContent/pages/components/outputFormat.jsp.xml 2008-09-19
13:16:24 UTC (rev 10381)
+++
trunk/jsf/tests/org.jboss.tools.jsf.vpe.jsf.test/resources/jsfTest/WebContent/pages/components/outputFormat.jsp.xml 2008-09-19
16:42:21 UTC (rev 10382)
@@ -10,7 +10,7 @@
<SPAN> outputFormat3 </SPAN>
</SPAN>
</test>
- <test id="outputFormat3">
+ <test id="outputFormat4">
<SPAN> outputFormat4 </SPAN>
</test>
</tests>
\ No newline at end of file
Modified:
trunk/jsf/tests/org.jboss.tools.jsf.vpe.jsf.test/resources/jsfTest/WebContent/pages/components/outputLabel.jsp
===================================================================
---
trunk/jsf/tests/org.jboss.tools.jsf.vpe.jsf.test/resources/jsfTest/WebContent/pages/components/outputLabel.jsp 2008-09-19
13:16:24 UTC (rev 10381)
+++
trunk/jsf/tests/org.jboss.tools.jsf.vpe.jsf.test/resources/jsfTest/WebContent/pages/components/outputLabel.jsp 2008-09-19
16:42:21 UTC (rev 10382)
@@ -9,7 +9,10 @@
<f:view>
<h1><h:outputText value="outputLabel" /></h1>
- <h:outputLabel value="outputLabel" />
+ <h:outputLabel value="outputLabel1" id="outputLabel1" />
+ <h:outputLabel escape="true" value="outputLabel2"
id="outputLabel2" />
+ <h:outputLabel escape="false" value="outputLabel3"
id="outputLabel3" />
+
</f:view>
</body>
</html>
\ No newline at end of file
Added:
trunk/jsf/tests/org.jboss.tools.jsf.vpe.jsf.test/resources/jsfTest/WebContent/pages/components/outputLabel.jsp.xml
===================================================================
---
trunk/jsf/tests/org.jboss.tools.jsf.vpe.jsf.test/resources/jsfTest/WebContent/pages/components/outputLabel.jsp.xml
(rev 0)
+++
trunk/jsf/tests/org.jboss.tools.jsf.vpe.jsf.test/resources/jsfTest/WebContent/pages/components/outputLabel.jsp.xml 2008-09-19
16:42:21 UTC (rev 10382)
@@ -0,0 +1,13 @@
+<tests>
+ <test id="outputLabel1">
+ <LABEL> outputLabel1</LABEL>
+ </test>
+ <test id="outputLabel2">
+ <LABEL> outputLabel2</LABEL>
+ </test>
+ <test id="outputLabel3">
+ <LABEL>
+ <SPAN> outputLabel3</SPAN>
+ </LABEL>
+ </test>
+</tests>
\ No newline at end of file
Modified:
trunk/jsf/tests/org.jboss.tools.jsf.vpe.jsf.test/resources/jsfTest/WebContent/pages/components/outputText.jsp
===================================================================
---
trunk/jsf/tests/org.jboss.tools.jsf.vpe.jsf.test/resources/jsfTest/WebContent/pages/components/outputText.jsp 2008-09-19
13:16:24 UTC (rev 10381)
+++
trunk/jsf/tests/org.jboss.tools.jsf.vpe.jsf.test/resources/jsfTest/WebContent/pages/components/outputText.jsp 2008-09-19
16:42:21 UTC (rev 10382)
@@ -9,7 +9,10 @@
<f:view>
<h1><h:outputText value="outputText" /></h1>
- <h:outputText value="outputText" />
+ <h:outputText value="outputText1" id="outputText1" />
+ <h:outputText value="outputText2" id="outputText2"
escape="true" />
+ <h:outputText value="outputText3" id="outputText3"
escape="false" />
+
</f:view>
</body>
</html>
\ No newline at end of file
Added:
trunk/jsf/tests/org.jboss.tools.jsf.vpe.jsf.test/resources/jsfTest/WebContent/pages/components/outputText.jsp.xml
===================================================================
---
trunk/jsf/tests/org.jboss.tools.jsf.vpe.jsf.test/resources/jsfTest/WebContent/pages/components/outputText.jsp.xml
(rev 0)
+++
trunk/jsf/tests/org.jboss.tools.jsf.vpe.jsf.test/resources/jsfTest/WebContent/pages/components/outputText.jsp.xml 2008-09-19
16:42:21 UTC (rev 10382)
@@ -0,0 +1,13 @@
+<tests>
+ <test id="outputText1">
+ <SPAN> outputText1</SPAN>
+ </test>
+ <test id="outputText2">
+ <SPAN> outputText2</SPAN>
+ </test>
+ <test id="outputText3">
+ <SPAN>
+ <SPAN> outputText3</SPAN>
+ </SPAN>
+ </test>
+</tests>
\ No newline at end of file
Modified:
trunk/jsf/tests/org.jboss.tools.jsf.vpe.jsf.test/resources/jsfTest/WebContent/pages/components/panelGrid.jsp
===================================================================
---
trunk/jsf/tests/org.jboss.tools.jsf.vpe.jsf.test/resources/jsfTest/WebContent/pages/components/panelGrid.jsp 2008-09-19
13:16:24 UTC (rev 10381)
+++
trunk/jsf/tests/org.jboss.tools.jsf.vpe.jsf.test/resources/jsfTest/WebContent/pages/components/panelGrid.jsp 2008-09-19
16:42:21 UTC (rev 10382)
@@ -8,7 +8,7 @@
<f:view>
<h1><h:outputText value="panelGrid" /></h1>
- <h:panelGrid columns="2" rowClasses="oddRows,evenRows">
+ <h:panelGrid columns="2" rowClasses="oddRows,evenRows"
id="panelGrid" >
<h:outputText value="column 1" />
<h:outputText value="column 2" />
Added:
trunk/jsf/tests/org.jboss.tools.jsf.vpe.jsf.test/resources/jsfTest/WebContent/pages/components/panelGrid.jsp.xml
===================================================================
---
trunk/jsf/tests/org.jboss.tools.jsf.vpe.jsf.test/resources/jsfTest/WebContent/pages/components/panelGrid.jsp.xml
(rev 0)
+++
trunk/jsf/tests/org.jboss.tools.jsf.vpe.jsf.test/resources/jsfTest/WebContent/pages/components/panelGrid.jsp.xml 2008-09-19
16:42:21 UTC (rev 10382)
@@ -0,0 +1,40 @@
+<tests>
+ <test id="panelGrid">
+ <TABLE>
+ <TR>
+ <TD>
+ <DIV>
+ <TABLE BORDER="0">
+ <TBODY>
+ <TR CLASS="oddRows">
+ <TD>
+ <SPAN> column 1 </SPAN>
+ </TD>
+ <TD>
+ <SPAN> column 2 </SPAN>
+ </TD>
+ </TR>
+ <TR CLASS="evenRows">
+ <TD>
+ <SPAN> 1 </SPAN>
+ </TD>
+ <TD>
+ <SPAN> 2 </SPAN>
+ </TD>
+ </TR>
+ <TR CLASS="oddRows">
+ <TD>
+ <SPAN> 3 </SPAN>
+ </TD>
+ <TD>
+ <SPAN> 4 </SPAN>
+ </TD>
+ </TR>
+ </TBODY>
+ </TABLE>
+ </DIV>
+ </TD>
+ </TR>
+ </TABLE>
+ </test>
+</tests>
\ No newline at end of file
Modified:
trunk/jsf/tests/org.jboss.tools.jsf.vpe.jsf.test/resources/jsfTest/WebContent/pages/components/panelGroup.jsp
===================================================================
---
trunk/jsf/tests/org.jboss.tools.jsf.vpe.jsf.test/resources/jsfTest/WebContent/pages/components/panelGroup.jsp 2008-09-19
13:16:24 UTC (rev 10381)
+++
trunk/jsf/tests/org.jboss.tools.jsf.vpe.jsf.test/resources/jsfTest/WebContent/pages/components/panelGroup.jsp 2008-09-19
16:42:21 UTC (rev 10382)
@@ -13,11 +13,11 @@
<h:outputText value="column 1" />
<h:outputText value="column 2" />
- <h:panelGroup>
+ <h:panelGroup id="panelGroup1">
<h:outputText value="1" />
<h:outputText value="2" />
</h:panelGroup>
- <h:panelGroup>
+ <h:panelGroup id="panelGroup2" layout="block" >
<h:outputText value="3" />
<h:outputText value="4" />
</h:panelGroup>
Added:
trunk/jsf/tests/org.jboss.tools.jsf.vpe.jsf.test/resources/jsfTest/WebContent/pages/components/panelGroup.jsp.xml
===================================================================
---
trunk/jsf/tests/org.jboss.tools.jsf.vpe.jsf.test/resources/jsfTest/WebContent/pages/components/panelGroup.jsp.xml
(rev 0)
+++
trunk/jsf/tests/org.jboss.tools.jsf.vpe.jsf.test/resources/jsfTest/WebContent/pages/components/panelGroup.jsp.xml 2008-09-19
16:42:21 UTC (rev 10382)
@@ -0,0 +1,14 @@
+<tests>
+ <test id="panelGroup1">
+ <SPAN>
+ <SPAN> 1</SPAN>
+ <SPAN> 2</SPAN>
+ </SPAN>
+ </test>
+ <test id="panelGroup2">
+ <DIV>
+ <SPAN> 3</SPAN>
+ <SPAN> 4</SPAN>
+ </DIV>
+ </test>
+</tests>
\ No newline at end of file
Modified:
trunk/jsf/tests/org.jboss.tools.jsf.vpe.jsf.test/resources/jsfTest/WebContent/pages/components/selectBooleanCheckbox.jsp
===================================================================
---
trunk/jsf/tests/org.jboss.tools.jsf.vpe.jsf.test/resources/jsfTest/WebContent/pages/components/selectBooleanCheckbox.jsp 2008-09-19
13:16:24 UTC (rev 10381)
+++
trunk/jsf/tests/org.jboss.tools.jsf.vpe.jsf.test/resources/jsfTest/WebContent/pages/components/selectBooleanCheckbox.jsp 2008-09-19
16:42:21 UTC (rev 10382)
@@ -10,7 +10,7 @@
<h1><h:outputText value="selectBooleanCheckbox" /></h1>
<h:outputText value="selectBooleanCheckbox:" />
- <h:selectBooleanCheckbox value="false" />
+ <h:selectBooleanCheckbox value="false"
id="selectBooleanCheckbox"/>
</f:view>
</body>
Added:
trunk/jsf/tests/org.jboss.tools.jsf.vpe.jsf.test/resources/jsfTest/WebContent/pages/components/selectBooleanCheckbox.jsp.xml
===================================================================
---
trunk/jsf/tests/org.jboss.tools.jsf.vpe.jsf.test/resources/jsfTest/WebContent/pages/components/selectBooleanCheckbox.jsp.xml
(rev 0)
+++
trunk/jsf/tests/org.jboss.tools.jsf.vpe.jsf.test/resources/jsfTest/WebContent/pages/components/selectBooleanCheckbox.jsp.xml 2008-09-19
16:42:21 UTC (rev 10382)
@@ -0,0 +1,5 @@
+<tests>
+ <test id="selectBooleanCheckbox">
+ <INPUT TYPE="checkbox" />
+ </test>
+</tests>
\ No newline at end of file
Modified:
trunk/jsf/tests/org.jboss.tools.jsf.vpe.jsf.test/resources/jsfTest/WebContent/pages/components/selectManyCheckbox.jsp
===================================================================
---
trunk/jsf/tests/org.jboss.tools.jsf.vpe.jsf.test/resources/jsfTest/WebContent/pages/components/selectManyCheckbox.jsp 2008-09-19
13:16:24 UTC (rev 10381)
+++
trunk/jsf/tests/org.jboss.tools.jsf.vpe.jsf.test/resources/jsfTest/WebContent/pages/components/selectManyCheckbox.jsp 2008-09-19
16:42:21 UTC (rev 10382)
@@ -11,12 +11,20 @@
<h:outputText value="selectManyCheckbox:" />
- <h:selectManyCheckbox value="someValue">
+ <h:selectManyCheckbox value="someValue" layout="pageDirection"
+ id="selectManyCheckbox1">
<f:selectItem itemLabel="check1" />
<f:selectItem itemLabel="check2" />
<f:selectItem itemLabel="check3" />
</h:selectManyCheckbox>
+ <h:selectManyCheckbox value="someValue" layout="lineDirection"
+ id="selectManyCheckbox2">
+ <f:selectItem itemLabel="check1" />
+ <f:selectItem itemLabel="check2" />
+ <f:selectItem itemLabel="check3" />
+ </h:selectManyCheckbox>
+
</f:view>
</body>
</html>
\ No newline at end of file
Added:
trunk/jsf/tests/org.jboss.tools.jsf.vpe.jsf.test/resources/jsfTest/WebContent/pages/components/selectManyCheckbox.jsp.xml
===================================================================
---
trunk/jsf/tests/org.jboss.tools.jsf.vpe.jsf.test/resources/jsfTest/WebContent/pages/components/selectManyCheckbox.jsp.xml
(rev 0)
+++
trunk/jsf/tests/org.jboss.tools.jsf.vpe.jsf.test/resources/jsfTest/WebContent/pages/components/selectManyCheckbox.jsp.xml 2008-09-19
16:42:21 UTC (rev 10382)
@@ -0,0 +1,66 @@
+<tests>
+ <test id="selectManyCheckbox1">
+ <TABLE>
+ <TR>
+ <TD>
+ <SPAN>
+ <INPUT TYPE="checkbox" />
+ <LABEL>
+ <SPAN> check1</SPAN>
+ </LABEL>
+ </SPAN>
+ </TD>
+ </TR>
+ <TR>
+ <TD>
+ <SPAN>
+ <INPUT TYPE="checkbox" />
+ <LABEL>
+ <SPAN> check2</SPAN>
+ </LABEL>
+ </SPAN>
+ </TD>
+ </TR>
+ <TR>
+ <TD>
+ <SPAN>
+ <INPUT TYPE="checkbox" />
+ <LABEL>
+ <SPAN> check3</SPAN>
+ </LABEL>
+ </SPAN>
+ </TD>
+ </TR>
+ </TABLE>
+ </test>
+ <test id="selectManyCheckbox2">
+ <TABLE>
+ <TR>
+ <TD>
+ <SPAN>
+ <INPUT TYPE="checkbox" />
+ <LABEL>
+ <SPAN> check1</SPAN>
+ </LABEL>
+ </SPAN>
+ </TD>
+ <TD>
+ <SPAN>
+ <INPUT TYPE="checkbox" />
+ <LABEL>
+ <SPAN> check2</SPAN>
+ </LABEL>
+ </SPAN>
+ </TD>
+ <TD>
+ <SPAN>
+ <INPUT TYPE="checkbox" />
+ <LABEL>
+ <SPAN> check3</SPAN>
+ </LABEL>
+ </SPAN>
+ </TD>
+ </TR>
+ </TABLE>
+ </test>
+</tests>
\ No newline at end of file
Modified:
trunk/jsf/tests/org.jboss.tools.jsf.vpe.jsf.test/resources/jsfTest/WebContent/pages/components/selectManyListbox.jsp
===================================================================
---
trunk/jsf/tests/org.jboss.tools.jsf.vpe.jsf.test/resources/jsfTest/WebContent/pages/components/selectManyListbox.jsp 2008-09-19
13:16:24 UTC (rev 10381)
+++
trunk/jsf/tests/org.jboss.tools.jsf.vpe.jsf.test/resources/jsfTest/WebContent/pages/components/selectManyListbox.jsp 2008-09-19
16:42:21 UTC (rev 10382)
@@ -11,7 +11,7 @@
<h:outputText value="selectManyListbox:" />
- <h:selectManyListbox value="someValue">
+ <h:selectManyListbox value="someValue"
id="selectManyListbox">
<f:selectItem itemLabel="value1" itemValue="value1" />
<f:selectItem itemLabel="value2" itemValue="value2" />
</h:selectManyListbox>
Added:
trunk/jsf/tests/org.jboss.tools.jsf.vpe.jsf.test/resources/jsfTest/WebContent/pages/components/selectManyListbox.jsp.xml
===================================================================
---
trunk/jsf/tests/org.jboss.tools.jsf.vpe.jsf.test/resources/jsfTest/WebContent/pages/components/selectManyListbox.jsp.xml
(rev 0)
+++
trunk/jsf/tests/org.jboss.tools.jsf.vpe.jsf.test/resources/jsfTest/WebContent/pages/components/selectManyListbox.jsp.xml 2008-09-19
16:42:21 UTC (rev 10382)
@@ -0,0 +1,8 @@
+<tests>
+ <test id="selectManyListbox">
+ <SELECT MULTIPLE="multiple" SIZE="2">
+ <OPTION> value1</OPTION>
+ <OPTION> value2</OPTION>
+ </SELECT>
+ </test>
+</tests>
\ No newline at end of file
Modified:
trunk/jsf/tests/org.jboss.tools.jsf.vpe.jsf.test/resources/jsfTest/WebContent/pages/components/selectManyMenu.jsp
===================================================================
---
trunk/jsf/tests/org.jboss.tools.jsf.vpe.jsf.test/resources/jsfTest/WebContent/pages/components/selectManyMenu.jsp 2008-09-19
13:16:24 UTC (rev 10381)
+++
trunk/jsf/tests/org.jboss.tools.jsf.vpe.jsf.test/resources/jsfTest/WebContent/pages/components/selectManyMenu.jsp 2008-09-19
16:42:21 UTC (rev 10382)
@@ -11,7 +11,7 @@
<h:outputText value="selectManyMenu:" />
- <h:selectManyMenu value="someValue">
+ <h:selectManyMenu value="someValue" id="selectManyMenu">
<f:selectItem itemLabel="value1" itemValue="value1" />
<f:selectItem itemLabel="value2" itemValue="value2" />
<f:selectItem itemLabel="value3" itemValue="value3" />
Added:
trunk/jsf/tests/org.jboss.tools.jsf.vpe.jsf.test/resources/jsfTest/WebContent/pages/components/selectManyMenu.jsp.xml
===================================================================
---
trunk/jsf/tests/org.jboss.tools.jsf.vpe.jsf.test/resources/jsfTest/WebContent/pages/components/selectManyMenu.jsp.xml
(rev 0)
+++
trunk/jsf/tests/org.jboss.tools.jsf.vpe.jsf.test/resources/jsfTest/WebContent/pages/components/selectManyMenu.jsp.xml 2008-09-19
16:42:21 UTC (rev 10382)
@@ -0,0 +1,10 @@
+<tests>
+ <test id="selectManyMenu">
+ <SELECT MULTIPLE="multiple" SIZE="1">
+ <OPTION>value1</OPTION>
+ <OPTION>value2</OPTION>
+ <OPTION>value3</OPTION>
+ <OPTION>value4</OPTION>
+ </SELECT>
+ </test>
+</tests>
\ No newline at end of file
Modified:
trunk/jsf/tests/org.jboss.tools.jsf.vpe.jsf.test/resources/jsfTest/WebContent/pages/components/selectOneListbox.jsp
===================================================================
---
trunk/jsf/tests/org.jboss.tools.jsf.vpe.jsf.test/resources/jsfTest/WebContent/pages/components/selectOneListbox.jsp 2008-09-19
13:16:24 UTC (rev 10381)
+++
trunk/jsf/tests/org.jboss.tools.jsf.vpe.jsf.test/resources/jsfTest/WebContent/pages/components/selectOneListbox.jsp 2008-09-19
16:42:21 UTC (rev 10382)
@@ -11,7 +11,7 @@
<h:outputText value="selectOneListbox:" />
- <h:selectOneListbox value="someValue" >
+ <h:selectOneListbox value="someValue" id="selectOneListbox"
>
<f:selectItem itemLabel="value1" itemValue="value1" />
<f:selectItem itemLabel="value2" itemValue="value2" />
<f:selectItem itemLabel="value3" itemValue="value3" />
Added:
trunk/jsf/tests/org.jboss.tools.jsf.vpe.jsf.test/resources/jsfTest/WebContent/pages/components/selectOneListbox.jsp.xml
===================================================================
---
trunk/jsf/tests/org.jboss.tools.jsf.vpe.jsf.test/resources/jsfTest/WebContent/pages/components/selectOneListbox.jsp.xml
(rev 0)
+++
trunk/jsf/tests/org.jboss.tools.jsf.vpe.jsf.test/resources/jsfTest/WebContent/pages/components/selectOneListbox.jsp.xml 2008-09-19
16:42:21 UTC (rev 10382)
@@ -0,0 +1,9 @@
+<tests>
+ <test id="selectOneListbox">
+ <SELECT SIZE="3">
+ <OPTION> value1</OPTION>
+ <OPTION> value2</OPTION>
+ <OPTION> value3</OPTION>
+ </SELECT>
+ </test>
+</tests>
\ No newline at end of file
Modified:
trunk/jsf/tests/org.jboss.tools.jsf.vpe.jsf.test/resources/jsfTest/WebContent/pages/components/selectOneMenu.jsp
===================================================================
---
trunk/jsf/tests/org.jboss.tools.jsf.vpe.jsf.test/resources/jsfTest/WebContent/pages/components/selectOneMenu.jsp 2008-09-19
13:16:24 UTC (rev 10381)
+++
trunk/jsf/tests/org.jboss.tools.jsf.vpe.jsf.test/resources/jsfTest/WebContent/pages/components/selectOneMenu.jsp 2008-09-19
16:42:21 UTC (rev 10382)
@@ -11,7 +11,7 @@
<h:outputText value="selectOneMenu:" />
- <h:selectOneMenu value="someValue">
+ <h:selectOneMenu value="someValue" id="selectOneMenu">
<f:selectItem itemLabel="value1" itemValue="value1" />
<f:selectItem itemLabel="value2" itemValue="value2" />
Added:
trunk/jsf/tests/org.jboss.tools.jsf.vpe.jsf.test/resources/jsfTest/WebContent/pages/components/selectOneMenu.jsp.xml
===================================================================
---
trunk/jsf/tests/org.jboss.tools.jsf.vpe.jsf.test/resources/jsfTest/WebContent/pages/components/selectOneMenu.jsp.xml
(rev 0)
+++
trunk/jsf/tests/org.jboss.tools.jsf.vpe.jsf.test/resources/jsfTest/WebContent/pages/components/selectOneMenu.jsp.xml 2008-09-19
16:42:21 UTC (rev 10382)
@@ -0,0 +1,8 @@
+<tests>
+ <test id="selectOneMenu">
+ <SELECT SIZE="1">
+ <OPTION>value1</OPTION>
+ <OPTION>value2</OPTION>
+ </SELECT>
+ </test>
+</tests>
\ No newline at end of file
Modified:
trunk/jsf/tests/org.jboss.tools.jsf.vpe.jsf.test/src/org/jboss/tools/jsf/vpe/jsf/test/JsfComponentContentTest.java
===================================================================
---
trunk/jsf/tests/org.jboss.tools.jsf.vpe.jsf.test/src/org/jboss/tools/jsf/vpe/jsf/test/JsfComponentContentTest.java 2008-09-19
13:16:24 UTC (rev 10381)
+++
trunk/jsf/tests/org.jboss.tools.jsf.vpe.jsf.test/src/org/jboss/tools/jsf/vpe/jsf/test/JsfComponentContentTest.java 2008-09-19
16:42:21 UTC (rev 10382)
@@ -71,11 +71,11 @@
}
public void testOutputFormat() throws Throwable {
- assertTrue("it is necessery to add body of the test", false); //$NON-NLS-1$
+ performContentTest("components/outputFormat.jsp"); //$NON-NLS-1$
}
public void testOutputLabel() throws Throwable {
- assertTrue("it is necessery to add body of the test", false); //$NON-NLS-1$
+ performContentTest("components/outputLabel.jsp"); //$NON-NLS-1$
}
public void testOutputLink() throws Throwable {
@@ -83,42 +83,42 @@
}
public void testOutputText() throws Throwable {
- assertTrue("it is necessery to add body of the test", false); //$NON-NLS-1$
+ performContentTest("components/outputText.jsp"); //$NON-NLS-1$
}
public void testPanelGrid() throws Throwable {
- assertTrue("it is necessery to add body of the test", false); //$NON-NLS-1$
+ performContentTest("components/panelGrid.jsp"); //$NON-NLS-1$
}
public void testPanelGroup() throws Throwable {
- assertTrue("it is necessery to add body of the test", false); //$NON-NLS-1$
+ performContentTest("components/panelGroup.jsp"); //$NON-NLS-1$
}
public void testSelectBooleanCheckbox() throws Throwable {
- assertTrue("it is necessery to add body of the test", false); //$NON-NLS-1$
+ performContentTest("components/selectBooleanCheckbox.jsp"); //$NON-NLS-1$
}
public void testSelectManyCheckbox() throws Throwable {
- assertTrue("it is necessery to add body of the test", false); //$NON-NLS-1$
+ performContentTest("components/selectManyCheckbox.jsp"); //$NON-NLS-1$
}
public void testSelectManyListbox() throws Throwable {
- assertTrue("it is necessery to add body of the test", false); //$NON-NLS-1$
+ performContentTest("components/selectManyListbox.jsp"); //$NON-NLS-1$
}
public void testSelectManyMenu() throws Throwable {
- assertTrue("it is necessery to add body of the test", false); //$NON-NLS-1$
+ performContentTest("components/selectManyMenu.jsp"); //$NON-NLS-1$
}
public void testSelectOneListbox() throws Throwable {
- assertTrue("it is necessery to add body of the test", false); //$NON-NLS-1$
+ performContentTest("components/selectOneListbox.jsp"); //$NON-NLS-1$
}
public void testSelectOneMenu() throws Throwable {
- assertTrue("it is necessery to add body of the test", false); //$NON-NLS-1$
+ performContentTest("components/selectOneMenu.jsp"); //$NON-NLS-1$
}
- public void _testSelectOneRadio() throws Throwable {
+ public void testSelectOneRadio() throws Throwable {
assertTrue("it is necessery to add body of the test", false); //$NON-NLS-1$
}