JBoss Tools SVN: r11006 - /.
by jbosstools-commits＠lists.jboss.org
Author: yradtsevich
Date: 2008-10-20 11:55:25 -0400 (Mon, 20 Oct 2008)
New Revision: 11006
Added:
org.jboss.ide.eclipse.core/
Log:
Initial import.
16 years, 2 months
JBoss Tools SVN: r11005 - branches/jbosstools-3.0.0.Beta1/seam/plugins/org.jboss.tools.seam.ui.pages/src/org/jboss/tools/seam/ui/pages/editor/commands.
by jbosstools-commits＠lists.jboss.org
Author: scabanovich
Date: 2008-10-20 11:20:16 -0400 (Mon, 20 Oct 2008)
New Revision: 11005
Modified:
branches/jbosstools-3.0.0.Beta1/seam/plugins/org.jboss.tools.seam.ui.pages/src/org/jboss/tools/seam/ui/pages/editor/commands/AddExceptionOnDiagramHandler.java
Log:
JBIDE-2770
Modified: branches/jbosstools-3.0.0.Beta1/seam/plugins/org.jboss.tools.seam.ui.pages/src/org/jboss/tools/seam/ui/pages/editor/commands/AddExceptionOnDiagramHandler.java
===================================================================
--- branches/jbosstools-3.0.0.Beta1/seam/plugins/org.jboss.tools.seam.ui.pages/src/org/jboss/tools/seam/ui/pages/editor/commands/AddExceptionOnDiagramHandler.java 2008-10-20 15:18:32 UTC (rev 11004)
+++ branches/jbosstools-3.0.0.Beta1/seam/plugins/org.jboss.tools.seam.ui.pages/src/org/jboss/tools/seam/ui/pages/editor/commands/AddExceptionOnDiagramHandler.java 2008-10-20 15:20:16 UTC (rev 11005)
@@ -52,7 +52,7 @@
e.addChild(c);
m.addChild(e);
m.setModified(true);
- String pp = e.getPathPart();
+ String pp = "exception:" + e.getPathPart();
XModelObject created = diagram.getChildByPath(pp);
String shape = AddExceptionHandler.getShape(p);
if(created != null && shape != null) created.setAttributeValue("shape", shape);
16 years, 2 months
JBoss Tools SVN: r11004 - trunk/seam/plugins/org.jboss.tools.seam.ui.pages/src/org/jboss/tools/seam/ui/pages/editor/commands.
by jbosstools-commits＠lists.jboss.org
Author: scabanovich
Date: 2008-10-20 11:18:32 -0400 (Mon, 20 Oct 2008)
New Revision: 11004
Modified:
trunk/seam/plugins/org.jboss.tools.seam.ui.pages/src/org/jboss/tools/seam/ui/pages/editor/commands/AddExceptionOnDiagramHandler.java
Log:
JBIDE-2770
Modified: trunk/seam/plugins/org.jboss.tools.seam.ui.pages/src/org/jboss/tools/seam/ui/pages/editor/commands/AddExceptionOnDiagramHandler.java
===================================================================
--- trunk/seam/plugins/org.jboss.tools.seam.ui.pages/src/org/jboss/tools/seam/ui/pages/editor/commands/AddExceptionOnDiagramHandler.java 2008-10-20 15:01:18 UTC (rev 11003)
+++ trunk/seam/plugins/org.jboss.tools.seam.ui.pages/src/org/jboss/tools/seam/ui/pages/editor/commands/AddExceptionOnDiagramHandler.java 2008-10-20 15:18:32 UTC (rev 11004)
@@ -52,7 +52,7 @@
e.addChild(c);
m.addChild(e);
m.setModified(true);
- String pp = e.getPathPart();
+ String pp = "exception:" + e.getPathPart();
XModelObject created = diagram.getChildByPath(pp);
String shape = AddExceptionHandler.getShape(p);
if(created != null && shape != null) created.setAttributeValue("shape", shape);
16 years, 2 months
JBoss Tools SVN: r11003 - in branches/jbosstools-3.0.0.Beta1/seam/plugins/org.jboss.tools.seam.core/src/org/jboss/tools/seam: internal/core and 1 other directory.
by jbosstools-commits＠lists.jboss.org
Author: scabanovich
Date: 2008-10-20 11:01:18 -0400 (Mon, 20 Oct 2008)
New Revision: 11003
Modified:
branches/jbosstools-3.0.0.Beta1/seam/plugins/org.jboss.tools.seam.core/src/org/jboss/tools/seam/core/BijectedAttributeType.java
branches/jbosstools-3.0.0.Beta1/seam/plugins/org.jboss.tools.seam.core/src/org/jboss/tools/seam/internal/core/BijectedAttribute.java
Log:
JBIDE-2928
Modified: branches/jbosstools-3.0.0.Beta1/seam/plugins/org.jboss.tools.seam.core/src/org/jboss/tools/seam/core/BijectedAttributeType.java
===================================================================
--- branches/jbosstools-3.0.0.Beta1/seam/plugins/org.jboss.tools.seam.core/src/org/jboss/tools/seam/core/BijectedAttributeType.java 2008-10-20 14:57:43 UTC (rev 11002)
+++ branches/jbosstools-3.0.0.Beta1/seam/plugins/org.jboss.tools.seam.core/src/org/jboss/tools/seam/core/BijectedAttributeType.java 2008-10-20 15:01:18 UTC (rev 11003)
@@ -17,17 +17,19 @@
* @author Alexey Kazakov
*/
public enum BijectedAttributeType implements SeamAnnotations {
- IN(IN_ANNOTATION_TYPE, true),
- OUT(OUT_ANNOTATION_TYPE, true),
- DATA_BINDER(DATA_MODEL_ANNOTATION_TYPE, true),
- DATA_MODEL_SELECTION(DATA_MODEL_SELECTION_ANNOTATION_TYPE, false),
- DATA_MODEL_SELECTION_INDEX(DATA_MODEL_SELECTION_INDEX_ANNOTATION_TYPE, false);
+ IN(IN_ANNOTATION_TYPE, true, false),
+ OUT(OUT_ANNOTATION_TYPE, true, true),
+ DATA_BINDER(DATA_MODEL_ANNOTATION_TYPE, true, true),
+ DATA_MODEL_SELECTION(DATA_MODEL_SELECTION_ANNOTATION_TYPE, false, true),
+ DATA_MODEL_SELECTION_INDEX(DATA_MODEL_SELECTION_INDEX_ANNOTATION_TYPE, false, true);
boolean isUsingMemberName;
+ boolean isOutjection;
- BijectedAttributeType(String annotationType, boolean isUsingMemberName) {
+ BijectedAttributeType(String annotationType, boolean isUsingMemberName, boolean isOutjection) {
this.annotationType = annotationType;
this.isUsingMemberName = isUsingMemberName;
+ this.isOutjection = isOutjection;
}
String annotationType;
@@ -43,4 +45,8 @@
return isUsingMemberName;
}
-}
\ No newline at end of file
+ public boolean isOut() {
+ return isOutjection;
+ }
+
+}
Modified: branches/jbosstools-3.0.0.Beta1/seam/plugins/org.jboss.tools.seam.core/src/org/jboss/tools/seam/internal/core/BijectedAttribute.java
===================================================================
--- branches/jbosstools-3.0.0.Beta1/seam/plugins/org.jboss.tools.seam.core/src/org/jboss/tools/seam/internal/core/BijectedAttribute.java 2008-10-20 14:57:43 UTC (rev 11002)
+++ branches/jbosstools-3.0.0.Beta1/seam/plugins/org.jboss.tools.seam.core/src/org/jboss/tools/seam/internal/core/BijectedAttribute.java 2008-10-20 15:01:18 UTC (rev 11003)
@@ -43,9 +43,11 @@
}
public boolean isContextVariable() {
- //TODO which else?
- return isOfType(BijectedAttributeType.OUT)
- || isOfType(BijectedAttributeType.DATA_BINDER);
+ if(types == null || types.length == 0) return false;
+ for (int i = 0; i < types.length; i++) {
+ if(types[i].isOut()) return true;
+ }
+ return false;
}
public void setTypes(BijectedAttributeType[] types) {
16 years, 2 months
JBoss Tools SVN: r11002 - in trunk/seam/plugins/org.jboss.tools.seam.core/src/org/jboss/tools/seam: internal/core and 1 other directory.
by jbosstools-commits＠lists.jboss.org
Author: scabanovich
Date: 2008-10-20 10:57:43 -0400 (Mon, 20 Oct 2008)
New Revision: 11002
Modified:
trunk/seam/plugins/org.jboss.tools.seam.core/src/org/jboss/tools/seam/core/BijectedAttributeType.java
trunk/seam/plugins/org.jboss.tools.seam.core/src/org/jboss/tools/seam/internal/core/BijectedAttribute.java
Log:
JBIDE-2928
Modified: trunk/seam/plugins/org.jboss.tools.seam.core/src/org/jboss/tools/seam/core/BijectedAttributeType.java
===================================================================
--- trunk/seam/plugins/org.jboss.tools.seam.core/src/org/jboss/tools/seam/core/BijectedAttributeType.java 2008-10-20 14:47:54 UTC (rev 11001)
+++ trunk/seam/plugins/org.jboss.tools.seam.core/src/org/jboss/tools/seam/core/BijectedAttributeType.java 2008-10-20 14:57:43 UTC (rev 11002)
@@ -17,17 +17,19 @@
* @author Alexey Kazakov
*/
public enum BijectedAttributeType implements SeamAnnotations {
- IN(IN_ANNOTATION_TYPE, true),
- OUT(OUT_ANNOTATION_TYPE, true),
- DATA_BINDER(DATA_MODEL_ANNOTATION_TYPE, true),
- DATA_MODEL_SELECTION(DATA_MODEL_SELECTION_ANNOTATION_TYPE, false),
- DATA_MODEL_SELECTION_INDEX(DATA_MODEL_SELECTION_INDEX_ANNOTATION_TYPE, false);
+ IN(IN_ANNOTATION_TYPE, true, false),
+ OUT(OUT_ANNOTATION_TYPE, true, true),
+ DATA_BINDER(DATA_MODEL_ANNOTATION_TYPE, true, true),
+ DATA_MODEL_SELECTION(DATA_MODEL_SELECTION_ANNOTATION_TYPE, false, true),
+ DATA_MODEL_SELECTION_INDEX(DATA_MODEL_SELECTION_INDEX_ANNOTATION_TYPE, false, true);
boolean isUsingMemberName;
+ boolean isOutjection;
- BijectedAttributeType(String annotationType, boolean isUsingMemberName) {
+ BijectedAttributeType(String annotationType, boolean isUsingMemberName, boolean isOutjection) {
this.annotationType = annotationType;
this.isUsingMemberName = isUsingMemberName;
+ this.isOutjection = isOutjection;
}
String annotationType;
@@ -43,4 +45,8 @@
return isUsingMemberName;
}
-}
\ No newline at end of file
+ public boolean isOut() {
+ return isOutjection;
+ }
+
+}
Modified: trunk/seam/plugins/org.jboss.tools.seam.core/src/org/jboss/tools/seam/internal/core/BijectedAttribute.java
===================================================================
--- trunk/seam/plugins/org.jboss.tools.seam.core/src/org/jboss/tools/seam/internal/core/BijectedAttribute.java 2008-10-20 14:47:54 UTC (rev 11001)
+++ trunk/seam/plugins/org.jboss.tools.seam.core/src/org/jboss/tools/seam/internal/core/BijectedAttribute.java 2008-10-20 14:57:43 UTC (rev 11002)
@@ -43,9 +43,11 @@
}
public boolean isContextVariable() {
- //TODO which else?
- return isOfType(BijectedAttributeType.OUT)
- || isOfType(BijectedAttributeType.DATA_BINDER);
+ if(types == null || types.length == 0) return false;
+ for (int i = 0; i < types.length; i++) {
+ if(types[i].isOut()) return true;
+ }
+ return false;
}
public void setTypes(BijectedAttributeType[] types) {
16 years, 2 months
JBoss Tools SVN: r11001 - in trunk/jsf: tests/org.jboss.tools.jsf.vpe.jsf.test/resources/jsf2test/WebContent and 2 other directories.
by jbosstools-commits＠lists.jboss.org
Author: yradtsevich
Date: 2008-10-20 10:47:54 -0400 (Mon, 20 Oct 2008)
New Revision: 11001
Added:
trunk/jsf/tests/org.jboss.tools.jsf.vpe.richfaces.test/resources/richFacesTest/WebContent/pages/components/subTable.xhtml
trunk/jsf/tests/org.jboss.tools.jsf.vpe.richfaces.test/resources/richFacesTest/WebContent/pages/components/subTable.xhtml.xml
Modified:
trunk/jsf/plugins/org.jboss.tools.jsf.vpe.richfaces/src/org/jboss/tools/jsf/vpe/richfaces/template/RichFacesDataTableTemplate.java
trunk/jsf/plugins/org.jboss.tools.jsf.vpe.richfaces/src/org/jboss/tools/jsf/vpe/richfaces/template/RichFacesSubTableTemplate.java
trunk/jsf/tests/org.jboss.tools.jsf.vpe.jsf.test/resources/jsf2test/WebContent/index.html
trunk/jsf/tests/org.jboss.tools.jsf.vpe.richfaces.test/src/org/jboss/tools/jsf/vpe/richfaces/test/RichFacesComponentTest.java
Log:
- Bug fix https://jira.jboss.org/jira/browse/JBIDE-2879 .
- A little refactoring made.
Modified: trunk/jsf/plugins/org.jboss.tools.jsf.vpe.richfaces/src/org/jboss/tools/jsf/vpe/richfaces/template/RichFacesDataTableTemplate.java
===================================================================
--- trunk/jsf/plugins/org.jboss.tools.jsf.vpe.richfaces/src/org/jboss/tools/jsf/vpe/richfaces/template/RichFacesDataTableTemplate.java 2008-10-20 14:46:20 UTC (rev 11000)
+++ trunk/jsf/plugins/org.jboss.tools.jsf.vpe.richfaces/src/org/jboss/tools/jsf/vpe/richfaces/template/RichFacesDataTableTemplate.java 2008-10-20 14:47:54 UTC (rev 11001)
@@ -342,7 +342,28 @@
return Math.max(currentLength,count);
}
+
+
+ /**
+ * @see org.jboss.tools.vpe.editor.template.VpeAbstractTemplate#validate(org.jboss.tools.vpe.editor.context.VpePageContext, org.w3c.dom.Node, org.mozilla.interfaces.nsIDOMDocument, org.jboss.tools.vpe.editor.template.VpeCreationData)
+ */
@Override
+ public void validate(VpePageContext pageContext, Node sourceNode,
+ nsIDOMDocument visualDocument, VpeCreationData data) {
+ Element sourceElement = (Element) sourceNode;
+ List<Node> children = ComponentUtil.getChildren(sourceElement);
+ if (children != null) {
+ for (Node child : children) {
+ if (child.getNodeName().endsWith(RichFaces.TAG_SUB_TABLE)) {
+ RichFacesSubTableTemplate.DEFAULT_INSTANCE.validate(pageContext, child, visualDocument, data);
+ }
+ }
+ }
+
+ super.validate(pageContext, sourceNode, visualDocument, data);
+ }
+
+ @Override
public void removeAttribute(VpePageContext pageContext, Element sourceElement, nsIDOMDocument visualDocument, nsIDOMNode visualNode, Object data, String name) {
nsIDOMElement visualElement = (nsIDOMElement)visualNode.queryInterface(nsIDOMElement.NS_IDOMELEMENT_IID);
visualElement.removeAttribute(name);
@@ -353,5 +374,4 @@
nsIDOMElement visualElement = (nsIDOMElement)visualNode.queryInterface(nsIDOMElement.NS_IDOMELEMENT_IID);
visualElement.setAttribute(name, value);
}
-
}
\ No newline at end of file
Modified: trunk/jsf/plugins/org.jboss.tools.jsf.vpe.richfaces/src/org/jboss/tools/jsf/vpe/richfaces/template/RichFacesSubTableTemplate.java
===================================================================
--- trunk/jsf/plugins/org.jboss.tools.jsf.vpe.richfaces/src/org/jboss/tools/jsf/vpe/richfaces/template/RichFacesSubTableTemplate.java 2008-10-20 14:46:20 UTC (rev 11000)
+++ trunk/jsf/plugins/org.jboss.tools.jsf.vpe.richfaces/src/org/jboss/tools/jsf/vpe/richfaces/template/RichFacesSubTableTemplate.java 2008-10-20 14:47:54 UTC (rev 11001)
@@ -7,27 +7,55 @@
*
* Contributors:
* Exadel, Inc. and Red Hat, Inc. - initial API and implementation
- ******************************************************************************/
+ ******************************************************************************/
package org.jboss.tools.jsf.vpe.richfaces.template;
import java.util.ArrayList;
import java.util.List;
import org.jboss.tools.jsf.vpe.richfaces.ComponentUtil;
+import org.jboss.tools.jsf.vpe.richfaces.template.util.RichFaces;
import org.jboss.tools.vpe.editor.context.VpePageContext;
import org.jboss.tools.vpe.editor.template.VpeAbstractTemplate;
import org.jboss.tools.vpe.editor.template.VpeChildrenInfo;
import org.jboss.tools.vpe.editor.template.VpeCreationData;
+import org.jboss.tools.vpe.editor.template.expression.VpeExpression;
+import org.jboss.tools.vpe.editor.template.expression.VpeExpressionBuilder;
+import org.jboss.tools.vpe.editor.template.expression.VpeExpressionBuilderException;
+import org.jboss.tools.vpe.editor.template.expression.VpeExpressionException;
+import org.jboss.tools.vpe.editor.util.HTML;
+import org.jboss.tools.vpe.editor.util.VpeClassUtil;
import org.mozilla.interfaces.nsIDOMDocument;
import org.mozilla.interfaces.nsIDOMElement;
import org.mozilla.interfaces.nsIDOMNode;
+import org.mozilla.interfaces.nsIDOMNodeList;
import org.w3c.dom.Element;
import org.w3c.dom.Node;
public class RichFacesSubTableTemplate extends VpeAbstractTemplate {
+ /**
+ *
+ */
+ private static final String VAL_TRUE = "true";
+ /**
+ *
+ */
+ private static final String ATTR_BREAK_BEFORE = "breakBefore"; //$NON-NLS-1$
+ /**
+ *
+ */
+ private static final String COLUMN_CLASSES_EXPRESSION = "{@columnClasses}"; //$NON-NLS-1$
+ /**
+ *
+ */
+ private static final String ROW_CLASSES_EXPRESSION = "{@rowClasses}"; //$NON-NLS-1$
+ private static final String DEAFAULT_CELL_CLASS = "dr-subtable-cell rich-subtable-cell"; //$NON-NLS-1$
+ private static List<String> rowClasses;
+ private static List<String> columnClasses;
public static RichFacesSubTableTemplate DEFAULT_INSTANCE = new RichFacesSubTableTemplate();
+
public RichFacesSubTableTemplate() {
super();
}
@@ -41,67 +69,79 @@
* @param parentVisualNode
* @return
*/
- public VpeCreationData encode(VpeCreationData creationData, Element sourceElement, nsIDOMDocument visualDocument, nsIDOMElement parentVisualNode) {
+ public VpeCreationData encode(VpeCreationData creationData, final Element sourceElement, final nsIDOMDocument visualDocument, final nsIDOMElement parentVisualNode) {
if(creationData!=null) {
// Encode header
encodeHeader(creationData, sourceElement, visualDocument, parentVisualNode);
}
- nsIDOMElement tr = visualDocument.createElement("tr");
- ComponentUtil.copyAttributes(sourceElement, tr);
+ initClasses(sourceElement, null);
+ nsIDOMElement curTr = visualDocument.createElement(HTML.TAG_TR);
+ ComponentUtil.copyAttributes(sourceElement, curTr);
+
boolean header = false;
boolean footer = false;
+ int curRow = 0;
+ int curColumn = 0;
+
if(isHeader(sourceElement)) {
- tr.setAttribute("class", getHeaderClass());
- String style = getHeaderBackgoundImgStyle();
+ curTr.setAttribute(HTML.ATTR_CLASS, getHeaderClass());
+ final String style = getHeaderBackgoundImgStyle();
if(style!=null) {
- tr.setAttribute("style", style);
+ curTr.setAttribute(HTML.ATTR_STYLE, style);
}
header = true;
} else if(isFooter(sourceElement)) {
- tr.setAttribute("class", getFooterClass());
+ curTr.setAttribute(HTML.ATTR_CLASS, getFooterClass());
footer = true;
} else {
- tr.setAttribute("class", getCellClass());
+ curTr.setAttribute(HTML.ATTR_CLASS, getRowClass(curRow));
}
if(creationData==null) {
// Method was called from create()
- creationData = new VpeCreationData(tr);
+ creationData = new VpeCreationData(curTr);
} else {
// Method was called from dataTable
- parentVisualNode.appendChild(tr);
+ parentVisualNode.appendChild(curTr);
}
// Create mapping to Encode body
- VpeChildrenInfo trInfo = new VpeChildrenInfo(tr);
- creationData.addChildrenInfo(trInfo);
- List<Node> children = ComponentUtil.getChildren(sourceElement);
- for (Node child : children) {
- if(child.getNodeName().endsWith(":column")) {
- String breakBefore = ((Element)child).getAttribute("breakBefore");
- if(breakBefore!=null && breakBefore.equalsIgnoreCase("true")) {
- // Start new TR
- tr = visualDocument.createElement("tr");
+ VpeChildrenInfo trChildrenInfo = new VpeChildrenInfo(curTr);
+ final List<Node> children = ComponentUtil.getChildren(sourceElement);
+ for (final Node child : children) {
+ if (child.getNodeName().endsWith(':' + RichFaces.TAG_COLUMN)) {
+ final boolean breakBefore = VAL_TRUE.equals( ((Element)child).getAttribute(ATTR_BREAK_BEFORE) );
+ if (breakBefore) {
+ curRow++;
+ curColumn = 0;
+ curTr = visualDocument.createElement(HTML.TAG_TR);
+ ComponentUtil.copyAttributes(sourceElement, curTr);
+
if(header) {
- tr.setAttribute("class", getHeaderContinueClass());
+ curTr.setAttribute(HTML.ATTR_CLASS, getHeaderContinueClass());
} else if(footer) {
- tr.setAttribute("class", getFooterContinueClass());
+ curTr.setAttribute(HTML.ATTR_CLASS, getFooterContinueClass());
} else {
- tr.setAttribute("class", getCellClass());
+ curTr.setAttribute(HTML.ATTR_CLASS, getRowClass(curRow));
}
- ComponentUtil.copyAttributes(sourceElement, tr);
- if(parentVisualNode!=null) {
- parentVisualNode.appendChild(tr);
- }
- trInfo = new VpeChildrenInfo(tr);
- creationData.addChildrenInfo(trInfo);
+
+ parentVisualNode.appendChild(curTr);
+ trChildrenInfo = new VpeChildrenInfo(curTr);
+ creationData.addChildrenInfo(trChildrenInfo);
}
+
+ final VpeChildrenInfo innerTdChildrenInfo = new VpeChildrenInfo(curTr);
+ creationData.addChildrenInfo(innerTdChildrenInfo);
+ innerTdChildrenInfo.addSourceChild(child);
+ curColumn++;
+ } else {
+ trChildrenInfo.addSourceChild(child);
}
- trInfo.addSourceChild(child);
}
+
if(parentVisualNode!=null) {
// Encode footer
encodeFooter(creationData, sourceElement, visualDocument, parentVisualNode);
@@ -110,48 +150,84 @@
return creationData;
}
- public VpeCreationData create(VpePageContext pageContext, Node sourceNode, nsIDOMDocument visualDocument) {
- Element sourceElement = (Element)sourceNode;
+ /** Adds necessary attributes to its children.*/
+ @Override
+ public void validate(final VpePageContext pageContext, final Node sourceNode,
+ final nsIDOMDocument visualDocument, final VpeCreationData creationData) {
+ initClasses(sourceNode, pageContext);
+ final List<VpeChildrenInfo> childrenInfoList = creationData.getChildrenInfoList();
+ if (childrenInfoList != null) {
+ for (final VpeChildrenInfo childrenInfo : childrenInfoList) {
+ final List<Node> sourceChildren = childrenInfo.getSourceChildren();
+ if (sourceChildren != null
+ && sourceChildren.size() > 0
+ && sourceChildren.get(0).getParentNode() == sourceNode) {
+ final nsIDOMNodeList visualChildren = childrenInfo.getVisualParent().getChildNodes();
+ addStylesToCells(visualDocument, visualChildren);
+ }
+ }
+ }
+ }
+
+ /** Adds HTML style classes names to all TDs from the list <code>visualChildren</code>
+ * according to <code>columnClasses</code> attribute of the tag. */
+ private void addStylesToCells(nsIDOMDocument visualDocument, nsIDOMNodeList visualChildren) {
+ int column = 0;
+ for (int i = 0; i < visualChildren.getLength(); i++) {
+ final nsIDOMNode visualChild = visualChildren.item(i);
+ if ( visualChild.getNodeType() == nsIDOMNode.ELEMENT_NODE && HTML.TAG_TD.equalsIgnoreCase(visualChild.getNodeName()) ) {
+ final nsIDOMNode tableCell = visualChild;
+ nsIDOMNode columnStyle = tableCell.getAttributes().getNamedItem(HTML.ATTR_CLASS);
+ if (columnStyle == null) {
+ columnStyle = visualDocument.createAttribute(HTML.ATTR_CLASS);
+ }
+ columnStyle.setNodeValue(columnStyle.getNodeValue() + ' ' + getColumnClass(column));
+ column++;
+ }
+ }
+ }
- VpeCreationData creationData = encode(null, sourceElement, visualDocument, null);
+ public VpeCreationData create(final VpePageContext pageContext, final Node sourceNode, final nsIDOMDocument visualDocument) {
+ final Element sourceElement = (Element)sourceNode;
+ final VpeCreationData creationData = encode(null, sourceElement, visualDocument, null);
return creationData;
}
- protected void encodeHeader(VpeCreationData creationData, Element sourceElement, nsIDOMDocument visualDocument, nsIDOMElement parentVisualNode) {
+ protected void encodeHeader(final VpeCreationData creationData, final Element sourceElement, final nsIDOMDocument visualDocument, final nsIDOMElement parentVisualNode) {
encodeHeaderOrFooter(creationData, sourceElement, visualDocument, parentVisualNode, "header", "dr-subtable-header rich-subtable-header", "dr-subtable-headercell rich-subtable-headercell");
}
- protected void encodeFooter(VpeCreationData creationData, Element sourceElement, nsIDOMDocument visualDocument, nsIDOMElement parentVisualNode) {
+ protected void encodeFooter(final VpeCreationData creationData, final Element sourceElement, final nsIDOMDocument visualDocument, final nsIDOMElement parentVisualNode) {
encodeHeaderOrFooter(creationData, sourceElement, visualDocument, parentVisualNode, "footer", "dr-subtable-footer rich-subtable-footer", "dr-subtable-footercell rich-subtable-footercell");
}
- protected void encodeHeaderOrFooter(VpeCreationData creationData, Element sourceElement, nsIDOMDocument visualDocument, nsIDOMElement parentVisualNode, String facetName, String trClass, String tdClass) {
- ArrayList<Element> columns = RichFacesDataTableTemplate.getColumns(sourceElement);
- ArrayList<Element> columnsHeaders = RichFacesDataTableTemplate.getColumnsWithFacet(columns, facetName);
+ protected void encodeHeaderOrFooter(final VpeCreationData creationData, final Element sourceElement, final nsIDOMDocument visualDocument, final nsIDOMElement parentVisualNode, final String facetName, final String trClass, final String tdClass) {
+ final ArrayList<Element> columns = RichFacesDataTableTemplate.getColumns(sourceElement);
+ final ArrayList<Element> columnsHeaders = RichFacesDataTableTemplate.getColumnsWithFacet(columns, facetName);
if(!columnsHeaders.isEmpty()) {
- nsIDOMElement tr = visualDocument.createElement("tr");
+ final nsIDOMElement tr = visualDocument.createElement(HTML.TAG_TR);
parentVisualNode.appendChild(tr);
- String styleClass = trClass;
+ final String styleClass = trClass;
if(styleClass!=null) {
- tr.setAttribute("class", styleClass);
+ tr.setAttribute(HTML.ATTR_CLASS, styleClass);
}
RichFacesDataTableTemplate.encodeHeaderOrFooterFacets(creationData, tr, visualDocument, columnsHeaders,
tdClass,
- null, facetName, "td");
+ null, facetName, HTML.TAG_TD);
}
}
- private boolean isHeader(Element sourceElement) {
+ private boolean isHeader(final Element sourceElement) {
return icludedInFacet(sourceElement, "header");
}
- private boolean isFooter(Element sourceElement) {
+ private boolean isFooter(final Element sourceElement) {
return icludedInFacet(sourceElement, "footer");
}
- private boolean icludedInFacet(Element sourceElement, String facetName) {
- Node parent = sourceElement.getParentNode();
+ private boolean icludedInFacet(final Element sourceElement, final String facetName) {
+ final Node parent = sourceElement.getParentNode();
return parent!=null && ComponentUtil.isFacet(parent, facetName);
}
@@ -171,23 +247,64 @@
return "dr-subtable-footer-continue rich-subtable-footer-continue";
}
- protected String getCellClass() {
- return "dr-subtable-cell rich-subtable-cell";
+ private String getRowClass(final int row) {
+ StringBuffer rowClass = new StringBuffer(DEAFAULT_CELL_CLASS);
+
+ if (rowClasses != null) {
+ final int rowClassesSize = rowClasses.size();
+ if(rowClassesSize > 0) {
+ rowClass = new StringBuffer(rowClasses.get(row % rowClassesSize));
+ }
+ }
+
+ return rowClass.toString();
}
+ private String getColumnClass(final int column) {
+ StringBuffer columnClass = new StringBuffer(DEAFAULT_CELL_CLASS);
+ if (columnClasses != null) {
+ final int columnClassesSize = columnClasses.size();
+ if (columnClassesSize > 0) {
+ columnClass = new StringBuffer(columnClasses.get(column % columnClassesSize));
+ }
+ }
+ return columnClass.toString();
+ }
+
+ private void initClasses(final Node sourceNode, final VpePageContext pageContext) {
+ VpeExpression rowClassesExpr;
+ VpeExpression columnClassesExpr;
+ try {
+ rowClassesExpr = VpeExpressionBuilder
+ .buildCompletedExpression(ROW_CLASSES_EXPRESSION, caseSensitive).getExpression();
+ columnClassesExpr = VpeExpressionBuilder
+ .buildCompletedExpression(COLUMN_CLASSES_EXPRESSION, caseSensitive).getExpression();
+ } catch (final VpeExpressionBuilderException e) {
+ throw new RuntimeException(e);
+ }
+
+ try {
+ rowClasses = VpeClassUtil.getClasses(rowClassesExpr, sourceNode,
+ pageContext);
+ columnClasses = VpeClassUtil.getClasses(columnClassesExpr, sourceNode,
+ pageContext);
+ } catch (final VpeExpressionException e) {
+ throw new RuntimeException(e);
+ }
+ }
+
protected String getHeaderBackgoundImgStyle() {
return null;
}
- @Override
- public void removeAttribute(VpePageContext pageContext, Element sourceElement, nsIDOMDocument visualDocument, nsIDOMNode visualNode, Object data, String name) {
- nsIDOMElement visualElement = (nsIDOMElement)visualNode.queryInterface(nsIDOMElement.NS_IDOMELEMENT_IID);
- visualElement.removeAttribute(name);
- }
+ /* (non-Javadoc)
+ * @see org.jboss.tools.vpe.editor.template.VpeAbstractTemplate#isRecreateAtAttrChange(org.jboss.tools.vpe.editor.context.VpePageContext, org.w3c.dom.Element, org.mozilla.interfaces.nsIDOMDocument, org.mozilla.interfaces.nsIDOMElement, java.lang.Object, java.lang.String, java.lang.String)
+ */
@Override
- public void setAttribute(VpePageContext pageContext, Element sourceElement, nsIDOMDocument visualDocument, nsIDOMNode visualNode, Object data, String name, String value) {
- nsIDOMElement visualElement = (nsIDOMElement)visualNode.queryInterface(nsIDOMElement.NS_IDOMELEMENT_IID);
- visualElement.setAttribute(name, value);
+ public boolean isRecreateAtAttrChange(final VpePageContext pageContext,
+ final Element sourceElement, final nsIDOMDocument visualDocument,
+ final nsIDOMElement visualNode, final Object data, final String name, final String value) {
+ return true;
}
}
\ No newline at end of file
Modified: trunk/jsf/tests/org.jboss.tools.jsf.vpe.jsf.test/resources/jsf2test/WebContent/index.html
===================================================================
--- trunk/jsf/tests/org.jboss.tools.jsf.vpe.jsf.test/resources/jsf2test/WebContent/index.html 2008-10-20 14:46:20 UTC (rev 11000)
+++ trunk/jsf/tests/org.jboss.tools.jsf.vpe.jsf.test/resources/jsf2test/WebContent/index.html 2008-10-20 14:47:54 UTC (rev 11001)
@@ -7,7 +7,7 @@
<a href="jsf2test/pages/components/head2.xhtml">h:head (2nd)</a><br>
<a href="jsf2test/pages/components/body1.xhtml">h:body (1st)</a><br>
<a href="jsf2test/pages/components/body2.xhtml">h:body (2st)</a><br>
- <a href="jsf2test/pages/components/outputScript.xhtml">h:outputScript</a><br>
- <a href="jsf2test/pages/components/outputStylesheet.xhtml">h:outputStylesheet</a><br>
+ <a href="jsf2test/pages/components/outputScript.xhtml">h:outputScript</a><br>
+ <a href="jsf2test/pages/components/outputStylesheet.xhtml">h:outputStylesheet</a><br>
</body>
</html>
Added: trunk/jsf/tests/org.jboss.tools.jsf.vpe.richfaces.test/resources/richFacesTest/WebContent/pages/components/subTable.xhtml
===================================================================
--- trunk/jsf/tests/org.jboss.tools.jsf.vpe.richfaces.test/resources/richFacesTest/WebContent/pages/components/subTable.xhtml (rev 0)
+++ trunk/jsf/tests/org.jboss.tools.jsf.vpe.richfaces.test/resources/richFacesTest/WebContent/pages/components/subTable.xhtml 2008-10-20 14:47:54 UTC (rev 11001)
@@ -0,0 +1,96 @@
+<!DOCTYPE html PUBLIC "-//W3C//DTD XHTML 1.0 Transitional//EN" "http://www.w3.org/TR/xhtml1/DTD/xhtml1-transitional.dtd">
+<html xmlns="http://www.w3.org/1999/xhtml"
+ xmlns:ui="http://java.sun.com/jsf/facelets"
+ xmlns:h="http://java.sun.com/jsf/html"
+ xmlns:f="http://java.sun.com/jsf/core"
+ xmlns:a4j="http://richfaces.org/a4j"
+ xmlns:rich="http://richfaces.org/rich">
+
+<f:loadBundle basename="jsftraining.messages" var="msg" />
+
+<head>
+<style type="text/css">
+ .redText {
+ color:red;
+ background: yellow
+ }
+ .blueText {
+ color:blue;
+ background: lime;
+ font-weight: bold;
+ }
+</style>
+<title></title>
+<link rel="stylesheet"
+ href="${facesContext.externalContext.requestContextPath}/pages/main.css" />
+</head>
+<body>
+ <f:view>
+ <h:form>
+ <rich:dataTable id="dataTableID" value="#{bookList.label}" var="label">
+ <rich:subTable value="#{bookList.bookList}" var="book" rowClasses="redText, blueText" columnClasses="redText, blueText">
+ <rich:column rowspan="2">
+ <h:outputText value="#{book.price}" />
+ </rich:column>
+ <rich:column>
+ <h:outputText value="#{book.numOfCopies}" />
+ </rich:column>
+ <rich:column>
+ <h:outputText value="#{book.numOfCopies}" />
+ </rich:column>
+ <rich:column breakBefore="true">
+ <h:outputText value="#{book.numOfCopies}" />
+ </rich:column>
+ <rich:column rowspan="2" >
+ <h:outputText value="#{book.numOfCopies}"/>
+ </rich:column>
+ <rich:column breakBefore="true">
+ <h:outputText value="#{book.numOfCopies}" />
+ </rich:column>
+ <rich:column>
+ <h:outputText value="#{book.numOfCopies}" />
+ </rich:column>
+ <rich:column colspan="2" breakBefore="true">
+ <h:outputText value="#{book.numOfCopies}" />
+ </rich:column>
+ <rich:column>
+ <h:outputText value="#{book.numOfCopies}" />
+ </rich:column>
+ </rich:subTable>
+ <rich:column colspan="3">
+ <h:outputText value="#{book.price}" />
+ </rich:column>
+ <rich:subTable value="#{bookList.bookList}" var="book" rowClasses="redText, blueText" columnClasses="redText, blueText">
+ <rich:column rowspan="2">
+ <h:outputText value="#{book.price}" />
+ </rich:column>
+ <rich:column>
+ <h:outputText value="#{book.numOfCopies}" />
+ </rich:column>
+ <rich:column>
+ <h:outputText value="#{book.numOfCopies}" />
+ </rich:column>
+ <rich:column breakBefore="true">
+ <h:outputText value="#{book.numOfCopies}" />
+ </rich:column>
+ <rich:column rowspan="2" >
+ <h:outputText value="#{book.numOfCopies}"/>
+ </rich:column>
+ <rich:column breakBefore="true">
+ <h:outputText value="#{book.numOfCopies}" />
+ </rich:column>
+ <rich:column>
+ <h:outputText value="#{book.numOfCopies}" />
+ </rich:column>
+ <rich:column colspan="2" breakBefore="true">
+ <h:outputText value="#{book.numOfCopies}" />
+ </rich:column>
+ <rich:column>
+ <h:outputText value="#{book.numOfCopies}" />
+ </rich:column>
+ </rich:subTable>
+ </rich:dataTable>
+ </h:form>
+ </f:view>
+</body>
+</html>
\ No newline at end of file
Added: trunk/jsf/tests/org.jboss.tools.jsf.vpe.richfaces.test/resources/richFacesTest/WebContent/pages/components/subTable.xhtml.xml
===================================================================
--- trunk/jsf/tests/org.jboss.tools.jsf.vpe.richfaces.test/resources/richFacesTest/WebContent/pages/components/subTable.xhtml.xml (rev 0)
+++ trunk/jsf/tests/org.jboss.tools.jsf.vpe.richfaces.test/resources/richFacesTest/WebContent/pages/components/subTable.xhtml.xml 2008-10-20 14:47:54 UTC (rev 11001)
@@ -0,0 +1,100 @@
+<tests>
+ <test id="dataTableID">
+ <colgroup span="3"></colgroup>
+ <tbody>
+ <tr value="#{bookList.bookList}" var="book" rowclasses="redText, blueText"
+ columnclasses="redText, blueText" class="redText">
+ <td class="dr-table-cell rich-table-cell redText redText redText"
+ rowspan="2">
+ <span>#{book.price}</span>
+ </td>
+ <td class="dr-table-cell rich-table-cell blueText blueText blueText">
+ <span>#{book.numOfCopies}</span>
+ </td>
+ <td class="dr-table-cell rich-table-cell redText redText redText">
+ <span>#{book.numOfCopies}</span>
+ </td>
+ </tr>
+ <tr value="#{bookList.bookList}" var="book" rowclasses="redText, blueText"
+ columnclasses="redText, blueText" class="blueText">
+ <td class="dr-table-cell rich-table-cell redText redText"
+ breakbefore="true">
+ <span>#{book.numOfCopies}</span>
+ </td>
+ <td class="dr-table-cell rich-table-cell blueText blueText"
+ rowspan="2">
+ <span>#{book.numOfCopies}</span>
+ </td>
+ </tr>
+ <tr value="#{bookList.bookList}" var="book" rowclasses="redText, blueText"
+ columnclasses="redText, blueText" class="redText">
+ <td class="dr-table-cell rich-table-cell redText redText"
+ breakbefore="true">
+ <span>#{book.numOfCopies}</span>
+ </td>
+ <td class="dr-table-cell rich-table-cell blueText blueText">
+ <span>#{book.numOfCopies}</span>
+ </td>
+ </tr>
+ <tr value="#{bookList.bookList}" var="book" rowclasses="redText, blueText"
+ columnclasses="redText, blueText" class="blueText">
+ <td class="dr-table-cell rich-table-cell redText redText"
+ colspan="2" breakbefore="true">
+ <span>#{book.numOfCopies}</span>
+ </td>
+ <td class="dr-table-cell rich-table-cell blueText blueText">
+ <span>#{book.numOfCopies}</span>
+ </td>
+ </tr>
+ <tr class="dr-table-firstrow rich-table-firstrow">
+ <td class="dr-table-cell rich-table-cell" colspan="3">
+ <span>#{book.price}</span>
+ </td>
+ </tr>
+ <tr value="#{bookList.bookList}" var="book" rowclasses="redText, blueText"
+ columnclasses="redText, blueText" class="redText">
+ <td class="dr-table-cell rich-table-cell redText redText redText"
+ rowspan="2">
+ <span>#{book.price}</span>
+ </td>
+ <td class="dr-table-cell rich-table-cell blueText blueText blueText">
+ <span>#{book.numOfCopies}</span>
+ </td>
+ <td class="dr-table-cell rich-table-cell redText redText redText">
+ <span>#{book.numOfCopies}</span>
+ </td>
+ </tr>
+ <tr value="#{bookList.bookList}" var="book" rowclasses="redText, blueText"
+ columnclasses="redText, blueText" class="blueText">
+ <td class="dr-table-cell rich-table-cell redText redText"
+ breakbefore="true">
+ <span>#{book.numOfCopies}</span>
+ </td>
+ <td class="dr-table-cell rich-table-cell blueText blueText"
+ rowspan="2">
+ <span>#{book.numOfCopies}</span>
+ </td>
+ </tr>
+ <tr value="#{bookList.bookList}" var="book" rowclasses="redText, blueText"
+ columnclasses="redText, blueText" class="redText">
+ <td class="dr-table-cell rich-table-cell redText redText"
+ breakbefore="true">
+ <span>#{book.numOfCopies}</span>
+ </td>
+ <td class="dr-table-cell rich-table-cell blueText blueText">
+ <span>#{book.numOfCopies}</span>
+ </td>
+ </tr>
+ <tr value="#{bookList.bookList}" var="book" rowclasses="redText, blueText"
+ columnclasses="redText, blueText" class="blueText">
+ <td class="dr-table-cell rich-table-cell redText redText"
+ colspan="2" breakbefore="true">
+ <span>#{book.numOfCopies}</span>
+ </td>
+ <td class="dr-table-cell rich-table-cell blueText blueText">
+ <span>#{book.numOfCopies}</span>
+ </td>
+ </tr>
+ </tbody>
+ </test>
+</tests>
\ No newline at end of file
Modified: trunk/jsf/tests/org.jboss.tools.jsf.vpe.richfaces.test/src/org/jboss/tools/jsf/vpe/richfaces/test/RichFacesComponentTest.java
===================================================================
--- trunk/jsf/tests/org.jboss.tools.jsf.vpe.richfaces.test/src/org/jboss/tools/jsf/vpe/richfaces/test/RichFacesComponentTest.java 2008-10-20 14:46:20 UTC (rev 11000)
+++ trunk/jsf/tests/org.jboss.tools.jsf.vpe.richfaces.test/src/org/jboss/tools/jsf/vpe/richfaces/test/RichFacesComponentTest.java 2008-10-20 14:47:54 UTC (rev 11001)
@@ -213,4 +213,9 @@
performTestForVpeComponent((IFile) TestUtil.getComponentPath(
"components/listShuttle.xhtml", RichFacesAllTests.IMPORT_PROJECT_NAME)); //$NON-NLS-1$
}
+
+ public void testSubTable() throws Throwable {
+ performTestForVpeComponent((IFile) TestUtil.getComponentPath(
+ "components/subTable.xhtml", RichFacesAllTests.IMPORT_PROJECT_NAME)); //$NON-NLS-1$
+ }
}
16 years, 2 months
JBoss Tools SVN: r11000 - branches/jbosstools-3.0.0.Beta1/hibernatetools/plugins/org.hibernate.eclipse.jdt.ui/src/org/hibernate/eclipse/jdt/ui/internal/jpa/process.
by jbosstools-commits＠lists.jboss.org
Author: vyemialyanchyk
Date: 2008-10-20 10:46:20 -0400 (Mon, 20 Oct 2008)
New Revision: 11000
Modified:
branches/jbosstools-3.0.0.Beta1/hibernatetools/plugins/org.hibernate.eclipse.jdt.ui/src/org/hibernate/eclipse/jdt/ui/internal/jpa/process/ProcessEntityInfo.java
Log:
JBIDE-2930
Modified: branches/jbosstools-3.0.0.Beta1/hibernatetools/plugins/org.hibernate.eclipse.jdt.ui/src/org/hibernate/eclipse/jdt/ui/internal/jpa/process/ProcessEntityInfo.java
===================================================================
--- branches/jbosstools-3.0.0.Beta1/hibernatetools/plugins/org.hibernate.eclipse.jdt.ui/src/org/hibernate/eclipse/jdt/ui/internal/jpa/process/ProcessEntityInfo.java 2008-10-20 14:45:26 UTC (rev 10999)
+++ branches/jbosstools-3.0.0.Beta1/hibernatetools/plugins/org.hibernate.eclipse.jdt.ui/src/org/hibernate/eclipse/jdt/ui/internal/jpa/process/ProcessEntityInfo.java 2008-10-20 14:46:20 UTC (rev 11000)
@@ -145,7 +145,7 @@
}
public boolean visit(FieldDeclaration node) {
- if (node.getType().isSimpleType()) {
+ if (node.getType().isSimpleType() || node.getType().isPrimitiveType()) {
if (entityInfo.isAddGeneratedValueFlag()) {
String primaryIdName = entityInfo.getPrimaryIdName();
Iterator itVarNames = node.fragments().iterator();
16 years, 2 months
JBoss Tools SVN: r10999 - branches/jbosstools-3.0.0.Beta1/hibernatetools/plugins/org.hibernate.eclipse.jdt.ui/src/org/hibernate/eclipse/jdt/ui/internal/jpa/collect.
by jbosstools-commits＠lists.jboss.org
Author: vyemialyanchyk
Date: 2008-10-20 10:45:26 -0400 (Mon, 20 Oct 2008)
New Revision: 10999
Modified:
branches/jbosstools-3.0.0.Beta1/hibernatetools/plugins/org.hibernate.eclipse.jdt.ui/src/org/hibernate/eclipse/jdt/ui/internal/jpa/collect/CollectEntityInfo.java
Log:
JBIDE-2930
Modified: branches/jbosstools-3.0.0.Beta1/hibernatetools/plugins/org.hibernate.eclipse.jdt.ui/src/org/hibernate/eclipse/jdt/ui/internal/jpa/collect/CollectEntityInfo.java
===================================================================
--- branches/jbosstools-3.0.0.Beta1/hibernatetools/plugins/org.hibernate.eclipse.jdt.ui/src/org/hibernate/eclipse/jdt/ui/internal/jpa/collect/CollectEntityInfo.java 2008-10-20 14:31:24 UTC (rev 10998)
+++ branches/jbosstools-3.0.0.Beta1/hibernatetools/plugins/org.hibernate.eclipse.jdt.ui/src/org/hibernate/eclipse/jdt/ui/internal/jpa/collect/CollectEntityInfo.java 2008-10-20 14:45:26 UTC (rev 10999)
@@ -264,7 +264,15 @@
public boolean visit(FieldDeclaration node) {
if (node.getType().isPrimitiveType()) {
PrimitiveType pt = (PrimitiveType)node.getType();
- ITypeBinding tb = pt.resolveBinding();
+ if (!pt.getPrimitiveTypeCode().equals(PrimitiveType.BOOLEAN)) {
+ // this is candidate for primary id
+ Iterator itVarNames = node.fragments().iterator();
+ while (itVarNames.hasNext()) {
+ VariableDeclarationFragment var = (VariableDeclarationFragment)itVarNames.next();
+ String name = var.getName().getIdentifier();
+ entityInfo.addPrimaryIdCandidate(name);
+ }
+ }
} else if (node.getType().isSimpleType()) {
SimpleType st = (SimpleType)node.getType();
ITypeBinding tb = st.resolveBinding();
16 years, 2 months
JBoss Tools SVN: r10998 - in trunk/jsf/tests/org.jboss.tools.jsf.vpe.richfaces.test: src/org/jboss/tools/jsf/vpe/richfaces/test and 1 other directory.
by jbosstools-commits＠lists.jboss.org
Author: dmaliarevich
Date: 2008-10-20 10:31:24 -0400 (Mon, 20 Oct 2008)
New Revision: 10998
Added:
trunk/jsf/tests/org.jboss.tools.jsf.vpe.richfaces.test/resources/richFacesTest/WebContent/pages/components/dragListener.xhtml
trunk/jsf/tests/org.jboss.tools.jsf.vpe.richfaces.test/resources/richFacesTest/WebContent/pages/components/dropDownMenu.xhtml
trunk/jsf/tests/org.jboss.tools.jsf.vpe.richfaces.test/resources/richFacesTest/WebContent/pages/components/extendedDataTable.xhtml.xml
trunk/jsf/tests/org.jboss.tools.jsf.vpe.richfaces.test/resources/richFacesTest/WebContent/pages/components/menuItem.xhtml
trunk/jsf/tests/org.jboss.tools.jsf.vpe.richfaces.test/resources/richFacesTest/WebContent/pages/components/menuItem.xhtml.xml
Removed:
trunk/jsf/tests/org.jboss.tools.jsf.vpe.richfaces.test/resources/richFacesTest/WebContent/pages/components/dropDawnMenu.xhtml
Modified:
trunk/jsf/tests/org.jboss.tools.jsf.vpe.richfaces.test/src/org/jboss/tools/jsf/vpe/richfaces/test/RichFacesAllTests.java
trunk/jsf/tests/org.jboss.tools.jsf.vpe.richfaces.test/src/org/jboss/tools/jsf/vpe/richfaces/test/RichFacesComponentContentTest.java
trunk/jsf/tests/org.jboss.tools.jsf.vpe.richfaces.test/src/org/jboss/tools/jsf/vpe/richfaces/test/RichFacesComponentTest.java
Log:
https://jira.jboss.org/jira/browse/JBIDE-2810, tests for rich:dropDownMenu, rich:menuGroup, rich:menuItem, rich:dropListener, rich:dragListener, rich:extendedDataTable.
Added: trunk/jsf/tests/org.jboss.tools.jsf.vpe.richfaces.test/resources/richFacesTest/WebContent/pages/components/dragListener.xhtml
===================================================================
(Binary files differ)
Property changes on: trunk/jsf/tests/org.jboss.tools.jsf.vpe.richfaces.test/resources/richFacesTest/WebContent/pages/components/dragListener.xhtml
___________________________________________________________________
Name: svn:mime-type
+ application/xhtml+xml
Deleted: trunk/jsf/tests/org.jboss.tools.jsf.vpe.richfaces.test/resources/richFacesTest/WebContent/pages/components/dropDawnMenu.xhtml
===================================================================
--- trunk/jsf/tests/org.jboss.tools.jsf.vpe.richfaces.test/resources/richFacesTest/WebContent/pages/components/dropDawnMenu.xhtml 2008-10-20 14:27:16 UTC (rev 10997)
+++ trunk/jsf/tests/org.jboss.tools.jsf.vpe.richfaces.test/resources/richFacesTest/WebContent/pages/components/dropDawnMenu.xhtml 2008-10-20 14:31:24 UTC (rev 10998)
@@ -1,26 +0,0 @@
-<!DOCTYPE html PUBLIC "-//W3C//DTD XHTML 1.0 Transitional//EN" "http://www.w3.org/TR/xhtml1/DTD/xhtml1-transitional.dtd">
-<html xmlns="http://www.w3.org/1999/xhtml"
- xmlns:ui="http://java.sun.com/jsf/facelets"
- xmlns:h="http://java.sun.com/jsf/html"
- xmlns:f="http://java.sun.com/jsf/core"
- xmlns:a4j="http://richfaces.org/a4j"
- xmlns:rich="http://richfaces.org/rich">
-
-<head>
-</head>
-<body>
- <!-- Drop Down Menu,Menu Group, Menu Item, Menu Separator -->
- <rich:dropDownMenu value="File">
- <rich:menuItem submitMode="ajax" value="New">
- </rich:menuItem>
- <rich:menuItem submitMode="ajax" value="Open" />
- <rich:menuGroup value="Save As...">
- <rich:menuItem submitMode="ajax" value="Text File" />
- <rich:menuItem submitMode="ajax" value="PDF File" />
- </rich:menuGroup>
- <rich:menuItem submitMode="ajax" value="Close" />
- <rich:menuSeparator id="menuSeparator11" />
- <rich:menuItem submitMode="ajax" value="Exit" />
- </rich:dropDownMenu>
-</body>
-</html>
\ No newline at end of file
Copied: trunk/jsf/tests/org.jboss.tools.jsf.vpe.richfaces.test/resources/richFacesTest/WebContent/pages/components/dropDownMenu.xhtml (from rev 10890, trunk/jsf/tests/org.jboss.tools.jsf.vpe.richfaces.test/resources/richFacesTest/WebContent/pages/components/dropDawnMenu.xhtml)
===================================================================
--- trunk/jsf/tests/org.jboss.tools.jsf.vpe.richfaces.test/resources/richFacesTest/WebContent/pages/components/dropDownMenu.xhtml (rev 0)
+++ trunk/jsf/tests/org.jboss.tools.jsf.vpe.richfaces.test/resources/richFacesTest/WebContent/pages/components/dropDownMenu.xhtml 2008-10-20 14:31:24 UTC (rev 10998)
@@ -0,0 +1,37 @@
+<!DOCTYPE html PUBLIC "-//W3C//DTD XHTML 1.0 Transitional//EN" "http://www.w3.org/TR/xhtml1/DTD/xhtml1-transitional.dtd">
+<html xmlns="http://www.w3.org/1999/xhtml"
+ xmlns:ui="http://java.sun.com/jsf/facelets"
+ xmlns:h="http://java.sun.com/jsf/html"
+ xmlns:f="http://java.sun.com/jsf/core"
+ xmlns:a4j="http://richfaces.org/a4j"
+ xmlns:rich="http://richfaces.org/rich">
+
+<head>
+</head>
+<body>
+<f:view>
+ <h:form>
+ <rich:dropDownMenu id="dropDownMenu"
+ value="Menu 1"
+ direction="bottom-right"
+ disabled="false"
+ horizontalOffset="5"
+ jointPoint="br"
+ submitMode="server">
+ <rich:menuItem id="menuItem">
+ <h:outputText value="Item 1" />
+ </rich:menuItem>
+ <rich:menuGroup id="menuGroup" value="Group 2">
+ <rich:menuItem>
+ <h:outputText value="Item 2" />
+ </rich:menuItem>
+ </rich:menuGroup>
+ <rich:menuSeparator />
+ <rich:menuItem>
+ <h:outputText value="Item 3" />
+ </rich:menuItem>
+ </rich:dropDownMenu>
+ </h:form>
+</f:view>
+</body>
+</html>
\ No newline at end of file
Added: trunk/jsf/tests/org.jboss.tools.jsf.vpe.richfaces.test/resources/richFacesTest/WebContent/pages/components/extendedDataTable.xhtml.xml
===================================================================
--- trunk/jsf/tests/org.jboss.tools.jsf.vpe.richfaces.test/resources/richFacesTest/WebContent/pages/components/extendedDataTable.xhtml.xml (rev 0)
+++ trunk/jsf/tests/org.jboss.tools.jsf.vpe.richfaces.test/resources/richFacesTest/WebContent/pages/components/extendedDataTable.xhtml.xml 2008-10-20 14:31:24 UTC (rev 10998)
@@ -0,0 +1,205 @@
+<tests>
+ <test id="extendedDataTable">
+ <TABLE>
+ <TR>
+ <TD>
+ <DIV CLASS="dr-table-hidden" STYLE="width: 100%; height: 500px;">
+ <TABLE WIDTH="580" ID="table" VALUE="#{capitalsBean.capitals}"
+ VAR="cap" SORTMODE="#{extendedTableBean.sortMode}" SELECTIONMODE="#{extendedTableBean.selectionMode}"
+ CLASS="dr-table rich-table">
+ <COLGROUP SPAN="4">
+ </COLGROUP>
+ <THEAD>
+ <TR CLASS="dr-table-subheader rich-table-subheader">
+ <TD CLASS="dr-table-subheadercell rich-table-subheadercell"
+ SCOP="col">
+ <TABLE CELLSPACING="0" CELLPADDING="0" BORDER="0">
+ <TR>
+ <TD>
+ <SPAN> Flag</SPAN>
+ </TD>
+ <TD>
+ <BR _MOZ_DIRTY="" TYPE="_moz"/>
+ </TD>
+ </TR>
+ </TABLE>
+ </TD>
+ <TD CLASS="dr-table-subheadercell rich-table-subheadercell"
+ SCOP="col">
+ <TABLE CELLSPACING="0" CELLPADDING="0" BORDER="0">
+ <TR>
+ <TD>
+ <SPAN> State Name</SPAN>
+ </TD>
+ <TD>
+ <IMG
+ SRC="/.*org.jboss.tools.jsf.vpe.richfaces/resources/extendedDataTable/sortable.gif/"/>
+ </TD>
+ </TR>
+ </TABLE>
+ </TD>
+ <TD CLASS="dr-table-subheadercell rich-table-subheadercell"
+ SCOP="col">
+ <TABLE CELLSPACING="0" CELLPADDING="0" BORDER="0">
+ <TR>
+ <TD>
+ <SPAN> State Capital</SPAN>
+ </TD>
+ <TD>
+ <IMG
+ SRC="/.*org.jboss.tools.jsf.vpe.richfaces/resources/extendedDataTable/sortable.gif/"/>
+ </TD>
+ </TR>
+ </TABLE>
+ </TD>
+ <TD CLASS="dr-table-subheadercell rich-table-subheadercell"
+ SCOP="col">
+ <TABLE CELLSPACING="0" CELLPADDING="0" BORDER="0">
+ <TR>
+ <TD>
+ <SPAN> Time Zone</SPAN>
+ </TD>
+ <TD>
+ <BR _MOZ_DIRTY="" TYPE="_moz"/>
+ </TD>
+ </TR>
+ </TABLE>
+ </TD>
+ </TR>
+ <TR CLASS="dr-table-subheader rich-table-subheader">
+ <TD CLASS="dr-table-subheadercell rich-table-subheadercell"
+ SCOP="col">
+ <BR _MOZ_DIRTY="" TYPE="_moz"/>
+ </TD>
+ <TD CLASS="dr-table-subheadercell rich-table-subheadercell"
+ SCOP="col">
+ <DIV STYLE="padding: 4px;">
+ <INPUT TYPE="text" CLASS="extendedTable-input"/>
+ </DIV>
+ </TD>
+ <TD CLASS="dr-table-subheadercell rich-table-subheadercell"
+ SCOP="col">
+ <DIV STYLE="padding: 4px;">
+ <INPUT TYPE="text" CLASS="extendedTable-input"/>
+ </DIV>
+ </TD>
+ <TD CLASS="dr-table-subheadercell rich-table-subheadercell"
+ SCOP="col">
+ <BR _MOZ_DIRTY="" TYPE="_moz"/>
+ </TD>
+ </TR>
+ </THEAD>
+ <TBODY>
+ <TR CLASS="dr-table-firstrow rich-table-firstrow">
+ <TD CLASS="dr-table-cell rich-table-cell" SORTABLE="false">
+ <IMG
+ SRC="/.*org.jboss.tools.vpe/ve/unresolved_image.gif/"
+ STYLE="-moz-user-modify: read-write;"/>
+ </TD>
+ <TD WIDTH="170" CLASS="dr-table-cell rich-table-cell"
+ SORTABLE="true" SORTBY="#{cap.state}" FILTERBY="#{cap.state}"
+ FILTEREVENT="onkeyup">
+ <SPAN> #{cap.state}</SPAN>
+ </TD>
+ <TD WIDTH="170" CLASS="dr-table-cell rich-table-cell"
+ SORTABLE="true" SORTBY="#{cap.name}" FILTERBY="#{cap.state}"
+ FILTEREVENT="onkeyup">
+ <SPAN> #{cap.name}</SPAN>
+ </TD>
+ <TD CLASS="dr-table-cell rich-table-cell" SORTABLE="false">
+ <SPAN> #{cap.timeZone}</SPAN>
+ </TD>
+ </TR>
+ <TR CLASS="dr-table-firstrow rich-table-firstrow">
+ <TD CLASS="dr-table-cell rich-table-cell" SORTABLE="false">
+ <IMG
+ SRC="/.*org.jboss.tools.vpe/ve/unresolved_image.gif/"
+ STYLE="-moz-user-modify: read-write;"/>
+ </TD>
+ <TD WIDTH="170" CLASS="dr-table-cell rich-table-cell"
+ SORTABLE="true" SORTBY="#{cap.state}" FILTERBY="#{cap.state}"
+ FILTEREVENT="onkeyup">
+ <SPAN> #{cap.state}</SPAN>
+ </TD>
+ <TD WIDTH="170" CLASS="dr-table-cell rich-table-cell"
+ SORTABLE="true" SORTBY="#{cap.name}" FILTERBY="#{cap.state}"
+ FILTEREVENT="onkeyup">
+ <SPAN> #{cap.name}</SPAN>
+ </TD>
+ <TD CLASS="dr-table-cell rich-table-cell" SORTABLE="false">
+ <SPAN> #{cap.timeZone}</SPAN>
+ </TD>
+ </TR>
+ <TR CLASS="dr-table-firstrow rich-table-firstrow">
+ <TD CLASS="dr-table-cell rich-table-cell" SORTABLE="false">
+ <IMG
+ SRC="/.*org.jboss.tools.vpe/ve/unresolved_image.gif/"
+ STYLE="-moz-user-modify: read-write;"/>
+ </TD>
+ <TD WIDTH="170" CLASS="dr-table-cell rich-table-cell"
+ SORTABLE="true" SORTBY="#{cap.state}" FILTERBY="#{cap.state}"
+ FILTEREVENT="onkeyup">
+ <SPAN> #{cap.state}</SPAN>
+ </TD>
+ <TD WIDTH="170" CLASS="dr-table-cell rich-table-cell"
+ SORTABLE="true" SORTBY="#{cap.name}" FILTERBY="#{cap.state}"
+ FILTEREVENT="onkeyup">
+ <SPAN> #{cap.name}</SPAN>
+ </TD>
+ <TD CLASS="dr-table-cell rich-table-cell" SORTABLE="false">
+ <SPAN> #{cap.timeZone}</SPAN>
+ </TD>
+ </TR>
+ <TR CLASS="dr-table-firstrow rich-table-firstrow">
+ <TD CLASS="dr-table-cell rich-table-cell" SORTABLE="false">
+ <IMG
+ SRC="/.*org.jboss.tools.vpe/ve/unresolved_image.gif/"
+ STYLE="-moz-user-modify: read-write;"/>
+ </TD>
+ <TD WIDTH="170" CLASS="dr-table-cell rich-table-cell"
+ SORTABLE="true" SORTBY="#{cap.state}" FILTERBY="#{cap.state}"
+ FILTEREVENT="onkeyup">
+ <SPAN> #{cap.state}</SPAN>
+ </TD>
+ <TD WIDTH="170" CLASS="dr-table-cell rich-table-cell"
+ SORTABLE="true" SORTBY="#{cap.name}" FILTERBY="#{cap.state}"
+ FILTEREVENT="onkeyup">
+ <SPAN> #{cap.name}</SPAN>
+ </TD>
+ <TD CLASS="dr-table-cell rich-table-cell" SORTABLE="false">
+ <SPAN> #{cap.timeZone}</SPAN>
+ </TD>
+ </TR>
+ <TR CLASS="dr-table-firstrow rich-table-firstrow">
+ <TD CLASS="dr-table-cell rich-table-cell" SORTABLE="false">
+ <IMG
+ SRC="/.*org.jboss.tools.vpe/ve/unresolved_image.gif/"
+ STYLE="-moz-user-modify: read-write;"/>
+ </TD>
+ <TD WIDTH="170" CLASS="dr-table-cell rich-table-cell"
+ SORTABLE="true" SORTBY="#{cap.state}" FILTERBY="#{cap.state}"
+ FILTEREVENT="onkeyup">
+ <SPAN> #{cap.state}</SPAN>
+ </TD>
+ <TD WIDTH="170" CLASS="dr-table-cell rich-table-cell"
+ SORTABLE="true" SORTBY="#{cap.name}" FILTERBY="#{cap.state}"
+ FILTEREVENT="onkeyup">
+ <SPAN> #{cap.name}</SPAN>
+ </TD>
+ <TD CLASS="dr-table-cell rich-table-cell" SORTABLE="false">
+ <SPAN> #{cap.timeZone}</SPAN>
+ </TD>
+ </TR>
+ </TBODY>
+ </TABLE>
+ </DIV>
+ </TD>
+ <TD STYLE="height: 100%; width: 17px;">
+ <DIV STYLE="height: 100%; overflow-y: scroll;">
+ </DIV>
+ <BR _MOZ_DIRTY="" TYPE="_moz"/>
+ </TD>
+ </TR>
+ </TABLE>
+ </test>
+</tests>
\ No newline at end of file
Property changes on: trunk/jsf/tests/org.jboss.tools.jsf.vpe.richfaces.test/resources/richFacesTest/WebContent/pages/components/extendedDataTable.xhtml.xml
___________________________________________________________________
Name: svn:mime-type
+ text/xml
Name: svn:eol-style
+ native
Added: trunk/jsf/tests/org.jboss.tools.jsf.vpe.richfaces.test/resources/richFacesTest/WebContent/pages/components/menuItem.xhtml
===================================================================
(Binary files differ)
Property changes on: trunk/jsf/tests/org.jboss.tools.jsf.vpe.richfaces.test/resources/richFacesTest/WebContent/pages/components/menuItem.xhtml
___________________________________________________________________
Name: svn:mime-type
+ application/xhtml+xml
Added: trunk/jsf/tests/org.jboss.tools.jsf.vpe.richfaces.test/resources/richFacesTest/WebContent/pages/components/menuItem.xhtml.xml
===================================================================
--- trunk/jsf/tests/org.jboss.tools.jsf.vpe.richfaces.test/resources/richFacesTest/WebContent/pages/components/menuItem.xhtml.xml (rev 0)
+++ trunk/jsf/tests/org.jboss.tools.jsf.vpe.richfaces.test/resources/richFacesTest/WebContent/pages/components/menuItem.xhtml.xml 2008-10-20 14:31:24 UTC (rev 10998)
@@ -0,0 +1,19 @@
+<tests>
+ <test id="menuItem">
+
+<LI VPE-DDM-MENU-LI="" CLASS="rich-menu-item" STYLE="" >
+<DIV CLASS="dr-menu-item-top-div" >
+<SPAN CLASS="rich-menu-item-icon" >
+<IMG SRC="/.*org.jboss.tools.jsf.vpe.richfaces/resources/menuItem/spacer.gif/" />
+
+</SPAN>
+<SPAN CLASS="rich-menu-item-label" >
+<SPAN >
+Item 1
+</SPAN>
+</SPAN>
+</DIV>
+</LI>
+
+ </test>
+</tests>
\ No newline at end of file
Property changes on: trunk/jsf/tests/org.jboss.tools.jsf.vpe.richfaces.test/resources/richFacesTest/WebContent/pages/components/menuItem.xhtml.xml
___________________________________________________________________
Name: svn:mime-type
+ text/xml
Name: svn:eol-style
+ native
Modified: trunk/jsf/tests/org.jboss.tools.jsf.vpe.richfaces.test/src/org/jboss/tools/jsf/vpe/richfaces/test/RichFacesAllTests.java
===================================================================
--- trunk/jsf/tests/org.jboss.tools.jsf.vpe.richfaces.test/src/org/jboss/tools/jsf/vpe/richfaces/test/RichFacesAllTests.java 2008-10-20 14:27:16 UTC (rev 10997)
+++ trunk/jsf/tests/org.jboss.tools.jsf.vpe.richfaces.test/src/org/jboss/tools/jsf/vpe/richfaces/test/RichFacesAllTests.java 2008-10-20 14:31:24 UTC (rev 10998)
@@ -45,25 +45,25 @@
TestSuite suite = new TestSuite("Tests for Vpe RichFaces components"); // $NON //$NON-NLS-1$
// $JUnit-BEGIN$
- suite.addTestSuite(RichFacesComponentTest.class);
- suite.addTestSuite(JBIDE1579Test.class);
- suite.addTestSuite(Jbide1580Test.class);
- suite.addTestSuite(JBIDE1613Test.class);
- suite.addTestSuite(Jbide1614Test.class);
- suite.addTestSuite(Jbide1639Test.class);
- suite.addTestSuite(Jbide1682Test.class);
- suite.addTestSuite(Jbide1548Test.class);
- suite.addTestSuite(JBIDE1713Test.class);
- suite.addTestSuite(RichFacesJBIDE1169Test.class);
- suite.addTestSuite(RichFacesComboBoxTemplateTestCase.class);
- suite.addTestSuite(RichFacesInplaceInputTemplateTestCase.class);
- suite.addTestSuite(RichFacesInplaceSelectTemplateTestCase.class);
- suite.addTestSuite(RichFacesProgressBarTemplateTestCase.class);
- suite.addTestSuite(RichFacesFileUploadTemplateTestCase.class);
- suite.addTestSuite(RichFacesColumnsTemplateTestCase.class);
- suite.addTestSuite(RichFacesPickListTemplateTestCase.class);
- suite.addTestSuite(JBIDE1605Test.class);
- suite.addTestSuite(JBIDE1606Test.class);
+// suite.addTestSuite(RichFacesComponentTest.class);
+// suite.addTestSuite(JBIDE1579Test.class);
+// suite.addTestSuite(Jbide1580Test.class);
+// suite.addTestSuite(JBIDE1613Test.class);
+// suite.addTestSuite(Jbide1614Test.class);
+// suite.addTestSuite(Jbide1639Test.class);
+// suite.addTestSuite(Jbide1682Test.class);
+// suite.addTestSuite(Jbide1548Test.class);
+// suite.addTestSuite(JBIDE1713Test.class);
+// suite.addTestSuite(RichFacesJBIDE1169Test.class);
+// suite.addTestSuite(RichFacesComboBoxTemplateTestCase.class);
+// suite.addTestSuite(RichFacesInplaceInputTemplateTestCase.class);
+// suite.addTestSuite(RichFacesInplaceSelectTemplateTestCase.class);
+// suite.addTestSuite(RichFacesProgressBarTemplateTestCase.class);
+// suite.addTestSuite(RichFacesFileUploadTemplateTestCase.class);
+// suite.addTestSuite(RichFacesColumnsTemplateTestCase.class);
+// suite.addTestSuite(RichFacesPickListTemplateTestCase.class);
+// suite.addTestSuite(JBIDE1605Test.class);
+// suite.addTestSuite(JBIDE1606Test.class);
suite.addTestSuite(RichFacesComponentContentTest.class);
// $JUnit-END$
Modified: trunk/jsf/tests/org.jboss.tools.jsf.vpe.richfaces.test/src/org/jboss/tools/jsf/vpe/richfaces/test/RichFacesComponentContentTest.java
===================================================================
--- trunk/jsf/tests/org.jboss.tools.jsf.vpe.richfaces.test/src/org/jboss/tools/jsf/vpe/richfaces/test/RichFacesComponentContentTest.java 2008-10-20 14:27:16 UTC (rev 10997)
+++ trunk/jsf/tests/org.jboss.tools.jsf.vpe.richfaces.test/src/org/jboss/tools/jsf/vpe/richfaces/test/RichFacesComponentContentTest.java 2008-10-20 14:31:24 UTC (rev 10998)
@@ -124,27 +124,27 @@
}
public void testDragListener() throws Throwable {
- assertTrue("it is necessary to add a body of the test ", false);//$NON-NLS-1$
+ performInvisibleTagTest("components/dragListener.xhtml", "dragListener"); //$NON-NLS-1$ //$NON-NLS-2$
}
public void testDropListener() throws Throwable {
- assertTrue("it is necessary to add a body of the test ", false);//$NON-NLS-1$
+ performInvisibleTagTest("components/dropListener.xhtml", "dropListener"); //$NON-NLS-1$ //$NON-NLS-2$
}
public void testDropDownMenu() throws Throwable {
- assertTrue("it is necessary to add a body of the test ", false);//$NON-NLS-1$
+ performContentTest("components/dropDownMenu.xhtml");//$NON-NLS-1$
}
public void testExtendedDataTable() throws Throwable {
- assertTrue("it is necessary to add a body of the test ", false);//$NON-NLS-1$
+ performContentTest("components/extendedDataTable.xhtml");//$NON-NLS-1$
}
public void testMenuGroup() throws Throwable {
- assertTrue("it is necessary to add a body of the test ", false);//$NON-NLS-1$
+ performContentTest("components/menuGroup.xhtml");//$NON-NLS-1$
}
public void testMenuItem() throws Throwable {
- assertTrue("it is necessary to add a body of the test ", false);//$NON-NLS-1$
+ performContentTest("components/menuItem.xhtml");//$NON-NLS-1$
}
public void testMenuSeparator() throws Throwable {
Modified: trunk/jsf/tests/org.jboss.tools.jsf.vpe.richfaces.test/src/org/jboss/tools/jsf/vpe/richfaces/test/RichFacesComponentTest.java
===================================================================
--- trunk/jsf/tests/org.jboss.tools.jsf.vpe.richfaces.test/src/org/jboss/tools/jsf/vpe/richfaces/test/RichFacesComponentTest.java 2008-10-20 14:27:16 UTC (rev 10997)
+++ trunk/jsf/tests/org.jboss.tools.jsf.vpe.richfaces.test/src/org/jboss/tools/jsf/vpe/richfaces/test/RichFacesComponentTest.java 2008-10-20 14:31:24 UTC (rev 10998)
@@ -79,9 +79,9 @@
"components/dragAndDrop.xhtml", RichFacesAllTests.IMPORT_PROJECT_NAME)); //$NON-NLS-1$
}
- public void testDropDawnMenu() throws PartInitException, Throwable {
+ public void testDropDownMenu() throws PartInitException, Throwable {
performTestForVpeComponent((IFile) TestUtil.getComponentPath(
- "components/dropDawnMenu.xhtml", RichFacesAllTests.IMPORT_PROJECT_NAME)); //$NON-NLS-1$
+ "components/dropDownMenu.xhtml", RichFacesAllTests.IMPORT_PROJECT_NAME)); //$NON-NLS-1$
}
public void testEffect() throws PartInitException, Throwable {
16 years, 2 months
JBoss Tools SVN: r10997 - in trunk/vpe/plugins/org.jboss.tools.vpe/src/org/jboss/tools/vpe/editor: util and 1 other directory.
by jbosstools-commits＠lists.jboss.org
Author: dmaliarevich
Date: 2008-10-20 10:27:16 -0400 (Mon, 20 Oct 2008)
New Revision: 10997
Modified:
trunk/vpe/plugins/org.jboss.tools.vpe/src/org/jboss/tools/vpe/editor/template/expression/VpeFunctionSrc.java
trunk/vpe/plugins/org.jboss.tools.vpe/src/org/jboss/tools/vpe/editor/util/VpeStyleUtil.java
Log:
https://jira.jboss.org/jira/browse/JBIDE-2936, creating uri was updated.
Modified: trunk/vpe/plugins/org.jboss.tools.vpe/src/org/jboss/tools/vpe/editor/template/expression/VpeFunctionSrc.java
===================================================================
--- trunk/vpe/plugins/org.jboss.tools.vpe/src/org/jboss/tools/vpe/editor/template/expression/VpeFunctionSrc.java 2008-10-20 14:27:12 UTC (rev 10996)
+++ trunk/vpe/plugins/org.jboss.tools.vpe/src/org/jboss/tools/vpe/editor/template/expression/VpeFunctionSrc.java 2008-10-20 14:27:16 UTC (rev 10997)
@@ -179,7 +179,7 @@
}
protected String getUnresolved() {
- return IMG_PREFIX + getAbsoluteResourcePath(IMG_UNRESOLVED);
+ return IMG_PREFIX + getAbsoluteResourcePath(IMG_UNRESOLVED).replace('\\', '/');
}
protected String getPrefix() {
Modified: trunk/vpe/plugins/org.jboss.tools.vpe/src/org/jboss/tools/vpe/editor/util/VpeStyleUtil.java
===================================================================
--- trunk/vpe/plugins/org.jboss.tools.vpe/src/org/jboss/tools/vpe/editor/util/VpeStyleUtil.java 2008-10-20 14:27:12 UTC (rev 10996)
+++ trunk/vpe/plugins/org.jboss.tools.vpe/src/org/jboss/tools/vpe/editor/util/VpeStyleUtil.java 2008-10-20 14:27:16 UTC (rev 10997)
@@ -281,7 +281,7 @@
sourceElement.setAttribute(ATTRIBUTE_STYLE, style);
}
- // selets parameter from atribute style
+ // selects parameter from attribute style
public static String deleteFromString(String data, String begin, String end) {
int startPosition = data.indexOf(begin);
@@ -317,7 +317,7 @@
value = getFilePath(input, value);
}
- value = FILE_PROTOCOL + SLASH + SLASH + value;
+ value = FILE_PROTOCOL + SLASH + SLASH + value.replace('\\', '/');
URL url = null;
try {
url = new URL(value);
@@ -371,7 +371,7 @@
filePath = getFilePath(input, filePath);
}
- filePath = FILE_PROTOCOL + SLASH + SLASH + filePath;
+ filePath = FILE_PROTOCOL + SLASH + SLASH + filePath.replace('\\', '/');
URL url = null;
try {
url = new URL(filePath);
@@ -491,7 +491,7 @@
if (!new File(filePath).isAbsolute()) {
filePath = getFilePath(href_val, filePath);
} else {
- filePath = FILE_PROTOCOL + SLASH + SLASH + filePath;
+ filePath = FILE_PROTOCOL + SLASH + SLASH + filePath.replace('\\', '/');
}
URL url = null;
@@ -530,9 +530,9 @@
if (tagPath.isEmpty()) {
if (showUnresolvedImage) {
return FILE_PROTOCOL + SLASH + SLASH
- + getAbsoluteResourcePath(UNRESOLVED_IMAGE_PATH);
+ + getAbsoluteResourcePath(UNRESOLVED_IMAGE_PATH).replace('\\', '/');
} else {
- return path;
+ return path.replace('\\', '/');
}
}
@@ -545,16 +545,16 @@
.equalsIgnoreCase(device))) {
if (showUnresolvedImage) {
return FILE_PROTOCOL + SLASH + SLASH
- + getAbsoluteResourcePath(UNRESOLVED_IMAGE_PATH);
+ + getAbsoluteResourcePath(UNRESOLVED_IMAGE_PATH).replace('\\', '/');
} else {
- return path;
+ return path.replace('\\', '/');
}
}
File locFile = tagPath.toFile();
if (locFile.exists()) {
return FILE_PROTOCOL + SLASH + SLASH + SLASH
- + locFile.getAbsolutePath();
+ + locFile.getAbsolutePath().replace('\\', '/');
}
IEditorInput input = pageContext.getEditPart().getEditorInput();
@@ -603,16 +603,16 @@
File f = new File(location + File.separator + pathCopy);
if (f.exists()) {
return FILE_PROTOCOL + SLASH + SLASH + SLASH
- + f.getPath();
+ + f.getPath().replace('\\', '/');
}
}
}
}
if (showUnresolvedImage) {
return FILE_PROTOCOL + SLASH + SLASH
- + getAbsoluteResourcePath(UNRESOLVED_IMAGE_PATH);
+ + getAbsoluteResourcePath(UNRESOLVED_IMAGE_PATH).replace('\\', '/');
} else {
- return path;
+ return path.replace('\\', '/');
}
}
16 years, 2 months