JBoss Tools SVN: r6543 - in trunk/jsf/plugins/org.jboss.tools.jsf.vpe.jsf: templates and 1 other directory.
by jbosstools-commits＠lists.jboss.org
Author: dmaliarevich
Date: 2008-02-22 10:18:18 -0500 (Fri, 22 Feb 2008)
New Revision: 6543
Added:
trunk/jsf/plugins/org.jboss.tools.jsf.vpe.jsf/src/org/jboss/tools/jsf/vpe/jsf/template/JsfCheckboxSelectItemTemplate.java
trunk/jsf/plugins/org.jboss.tools.jsf.vpe.jsf/src/org/jboss/tools/jsf/vpe/jsf/template/JsfOptionSelectItemTemplate.java
trunk/jsf/plugins/org.jboss.tools.jsf.vpe.jsf/src/org/jboss/tools/jsf/vpe/jsf/template/JsfSelectManyCheckbox.java
Modified:
trunk/jsf/plugins/org.jboss.tools.jsf.vpe.jsf/templates/vpe-templates-jsf.xml
Log:
http://jira.jboss.com/jira/browse/JBIDE-1719
Added: trunk/jsf/plugins/org.jboss.tools.jsf.vpe.jsf/src/org/jboss/tools/jsf/vpe/jsf/template/JsfCheckboxSelectItemTemplate.java
===================================================================
--- trunk/jsf/plugins/org.jboss.tools.jsf.vpe.jsf/src/org/jboss/tools/jsf/vpe/jsf/template/JsfCheckboxSelectItemTemplate.java (rev 0)
+++ trunk/jsf/plugins/org.jboss.tools.jsf.vpe.jsf/src/org/jboss/tools/jsf/vpe/jsf/template/JsfCheckboxSelectItemTemplate.java 2008-02-22 15:18:18 UTC (rev 6543)
@@ -0,0 +1,160 @@
+/*******************************************************************************
+ * 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 org.jboss.tools.vpe.editor.VpeSourceDomBuilder;
+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.HTML;
+import org.mozilla.interfaces.nsIDOMDocument;
+import org.mozilla.interfaces.nsIDOMElement;
+import org.w3c.dom.Element;
+import org.w3c.dom.NamedNodeMap;
+import org.w3c.dom.Node;
+
+/**
+ * @author dmaliarevich
+ *
+ */
+public class JsfCheckboxSelectItemTemplate extends VpeAbstractTemplate {
+
+ private static final String ITEM_LABEL = "itemLabel";
+ private static final String TYPE_CHECKBOX = "checkbox";
+ private static final String CLASS = "class";
+
+ // style of span
+ private static final String SPAN_STYLE_VALUE = "-moz-user-modify: read-write;"; //$NON-NLS-1$
+
+ /*h:SelectManyCheckbox attributes*/
+ private static final String DISABLED = "disabled";
+ private static final String ENABLED_CLASS = "enabledClass";
+ private static final String DISABLED_CLASS = "disabledClass";
+
+ private String disabled;
+ private String enabledClass;
+ private String disabledClass;
+
+ /**
+ *
+ */
+ public JsfCheckboxSelectItemTemplate() {
+ }
+
+ /* (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)
+ */
+ public VpeCreationData create(VpePageContext pageContext, Node sourceNode,
+ nsIDOMDocument visualDocument) {
+
+ readAttributes(sourceNode.getParentNode());
+
+ nsIDOMElement input = visualDocument.createElement(HTML.TAG_INPUT);
+ nsIDOMElement label = visualDocument.createElement(HTML.TAG_LABEL);
+ // create span element
+ nsIDOMElement span = visualDocument.createElement(HTML.TAG_SPAN);
+
+ VpeCreationData creationData = new VpeCreationData(span);
+
+ // add title attribute to span
+ span.setAttribute(HTML.ATTR_TITLE, getTitle(sourceNode));
+ span.setAttribute(HTML.ATTR_STYLE, SPAN_STYLE_VALUE);
+
+ input.setAttribute(HTML.ATTR_TYPE, TYPE_CHECKBOX);
+
+ if (attrPresents(disabled) && "true".equalsIgnoreCase(disabled)) {
+ label.setAttribute(CLASS, disabledClass);
+ } else if (attrPresents(enabledClass)) {
+ label.setAttribute(CLASS, enabledClass);
+ }
+
+ String itemLabel = getLabel(sourceNode);
+ label.appendChild(visualDocument.createTextNode(itemLabel));
+
+ span.appendChild(input);
+ span.appendChild(label);
+
+ return creationData;
+ }
+
+ /**
+ * Checks is attribute presents.
+ *
+ * @param attr the attribute
+ *
+ * @return true, if successful
+ */
+ private boolean attrPresents(String attr) {
+ return ((null != attr) && (!"".equals(attr)));
+ }
+
+ /**
+ * generate title of element
+ *
+ * @param sourceNode
+ * @return
+ */
+ private String getTitle(Node sourceNode) {
+
+ String tagString = " <" + sourceNode.getNodeName(); //$NON-NLS-1$
+ NamedNodeMap attrs = sourceNode.getAttributes();
+ if (attrs != null) {
+ tagString += attrs.getLength() > 0 ? " " : ""; //$NON-NLS-1$ //$NON-NLS-2$
+ for (int i = 0; i < attrs.getLength(); i++) {
+ Node attr = attrs.item(i);
+ tagString += attr.getNodeName() + "=\"" + attr.getNodeValue() //$NON-NLS-1$
+ + "\"" + (i < (attrs.getLength() - 1) ? " " : ""); //$NON-NLS-1$ //$NON-NLS-2$ //$NON-NLS-3$
+ }
+ }
+ tagString += (sourceNode.hasChildNodes() ? "" : "/") + "> "; //$NON-NLS-1$ //$NON-NLS-2$ //$NON-NLS-3$
+
+ return tagString;
+ }
+
+ /**
+ * get Label of element
+ *
+ * @param sourceNode
+ * @return
+ */
+ private String getLabel(Node sourceNode) {
+ // get value of "itemLabeL" from jsf tag
+ Node attrNode = sourceNode.getAttributes().getNamedItem(ITEM_LABEL);
+ // if attribute exist return value
+ if (attrNode != null) {
+ return attrNode.getNodeValue();
+ }
+ return "";
+ }
+
+ /**
+ * Read attributes from the source element.
+ *
+ * @param sourceNode the source node
+ */
+ private void readAttributes(Node sourceNode) {
+ if (null == sourceNode) {
+ return;
+ }
+ Element source = (Element) sourceNode;
+ disabled = source.getAttribute(DISABLED);
+ enabledClass = source.getAttribute(ENABLED_CLASS);
+ disabledClass = source.getAttribute(DISABLED_CLASS);
+ }
+
+ @Override
+ public void setSourceAttributeSelection(VpePageContext pageContext,
+ Element sourceElement, int offset, int length, Object data) {
+ VpeSourceDomBuilder sourceBuilder = pageContext.getSourceBuilder();
+ sourceBuilder.setSelection(sourceElement, 0, 0);
+ }
+
+}
Property changes on: trunk/jsf/plugins/org.jboss.tools.jsf.vpe.jsf/src/org/jboss/tools/jsf/vpe/jsf/template/JsfCheckboxSelectItemTemplate.java
___________________________________________________________________
Name: svn:mime-type
+ text/plain
Name: svn:keywords
+ Author Id Revision Date
Name: svn:eol-style
+ native
Added: trunk/jsf/plugins/org.jboss.tools.jsf.vpe.jsf/src/org/jboss/tools/jsf/vpe/jsf/template/JsfOptionSelectItemTemplate.java
===================================================================
--- trunk/jsf/plugins/org.jboss.tools.jsf.vpe.jsf/src/org/jboss/tools/jsf/vpe/jsf/template/JsfOptionSelectItemTemplate.java (rev 0)
+++ trunk/jsf/plugins/org.jboss.tools.jsf.vpe.jsf/src/org/jboss/tools/jsf/vpe/jsf/template/JsfOptionSelectItemTemplate.java 2008-02-22 15:18:18 UTC (rev 6543)
@@ -0,0 +1,118 @@
+/*******************************************************************************
+ * 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 org.jboss.tools.vpe.editor.VpeSourceDomBuilder;
+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.HTML;
+import org.mozilla.interfaces.nsIDOMDocument;
+import org.mozilla.interfaces.nsIDOMElement;
+import org.w3c.dom.Element;
+import org.w3c.dom.Node;
+
+/**
+ * @author dmaliarevich
+ *
+ */
+public class JsfOptionSelectItemTemplate extends VpeAbstractTemplate {
+
+ private static final String CLASS = "class";
+ private static final String ITEM_LABEL = "itemLabel";
+
+ private static final String DISABLED = "disabled";
+ private static final String ENABLED_CLASS = "enabledClass";
+ private static final String DISABLED_CLASS = "disabledClass";
+
+ private String disabled;
+ private String enabledClass;
+ private String disabledClass;
+
+ /**
+ *
+ */
+ public JsfOptionSelectItemTemplate() {
+ }
+
+ /* (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)
+ */
+ public VpeCreationData create(VpePageContext pageContext, Node sourceNode,
+ nsIDOMDocument visualDocument) {
+
+ readAttributes(sourceNode.getParentNode());
+
+ nsIDOMElement option = visualDocument.createElement(HTML.TAG_OPTION);
+ VpeCreationData creationData = new VpeCreationData(option);
+
+ if (attrPresents(disabled) && "true".equalsIgnoreCase(disabled)) {
+ option.setAttribute(CLASS, disabledClass);
+ } else if (attrPresents(enabledClass)) {
+ option.setAttribute(CLASS, enabledClass);
+ }
+
+ String itemLabel = getLabel(sourceNode);
+ option.appendChild(visualDocument.createTextNode(itemLabel));
+
+ return creationData;
+ }
+
+ /**
+ * get Label of element
+ *
+ * @param sourceNode
+ * @return
+ */
+ private String getLabel(Node sourceNode) {
+ // get value of "itemLabeL" from jsf tag
+ Node attrNode = sourceNode.getAttributes().getNamedItem(ITEM_LABEL);
+ // if attribute exist return value
+ if (attrNode != null) {
+ return attrNode.getNodeValue();
+ }
+ return "";
+ }
+
+ /**
+ * Checks is attribute presents.
+ *
+ * @param attr the attribute
+ *
+ * @return true, if successful
+ */
+ private boolean attrPresents(String attr) {
+ return ((null != attr) && (!"".equals(attr)));
+ }
+
+ /**
+ * Read attributes from the source element.
+ *
+ * @param sourceNode the source node
+ */
+ private void readAttributes(Node sourceNode) {
+ if (null == sourceNode) {
+ return;
+ }
+ Element source = (Element) sourceNode;
+ disabled = source.getAttribute(DISABLED);
+ enabledClass = source.getAttribute(ENABLED_CLASS);
+ disabledClass = source.getAttribute(DISABLED_CLASS);
+ }
+
+ @Override
+ public void setSourceAttributeSelection(VpePageContext pageContext,
+ Element sourceElement, int offset, int length, Object data) {
+ VpeSourceDomBuilder sourceBuilder = pageContext.getSourceBuilder();
+ sourceBuilder.setSelection(sourceElement, 0, 0);
+ }
+
+}
Property changes on: trunk/jsf/plugins/org.jboss.tools.jsf.vpe.jsf/src/org/jboss/tools/jsf/vpe/jsf/template/JsfOptionSelectItemTemplate.java
___________________________________________________________________
Name: svn:mime-type
+ text/plain
Name: svn:keywords
+ Author Id Revision Date
Name: svn:eol-style
+ native
Added: 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 (rev 0)
+++ trunk/jsf/plugins/org.jboss.tools.jsf.vpe.jsf/src/org/jboss/tools/jsf/vpe/jsf/template/JsfSelectManyCheckbox.java 2008-02-22 15:18:18 UTC (rev 6543)
@@ -0,0 +1,157 @@
+/*******************************************************************************
+ * 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 javax.smartcardio.ATR;
+
+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.util.HTML;
+import org.jboss.tools.vpe.editor.util.VpeStyleUtil;
+import org.mozilla.interfaces.nsIDOMDocument;
+import org.mozilla.interfaces.nsIDOMElement;
+import org.mozilla.interfaces.nsIDOMNamedNodeMap;
+import org.w3c.dom.Element;
+import org.w3c.dom.NamedNodeMap;
+import org.w3c.dom.Node;
+import org.w3c.dom.NodeList;
+
+/**
+ * @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 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$
+ }
+
+ /**
+ *
+ */
+ public JsfSelectManyCheckbox() {
+ }
+
+ /*
+ * (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)
+ */
+ public VpeCreationData create(VpePageContext pageContext, Node sourceNode,
+ nsIDOMDocument visualDocument) {
+
+ readAttributes(sourceNode);
+
+ Element sourceElement = (Element) sourceNode;
+ nsIDOMElement table = visualDocument.createElement(HTML.TAG_TABLE);
+ nsIDOMElement tr = null;
+ nsIDOMElement td = null;
+
+ if (attrPresents(style)) {
+ table.setAttribute(STYLE, style);
+ }
+ if (attrPresents(styleClass)) {
+ table.setAttribute(CLASS, styleClass);
+ }
+ if (attrPresents(border)) {
+ table.setAttribute(BORDER, border);
+ }
+
+ VpeCreationData creationData = new VpeCreationData(table);
+
+ NodeList children = sourceNode.getChildNodes();
+
+ if (attrPresents(layout) && PAGE_DIRECTION.equalsIgnoreCase(layout)) {
+ for (int i = 0; i < children.getLength(); i++) {
+ Node child = children.item(i);
+ // if children is one of visible items
+ if (CHILDREN_LIST.contains(child.getLocalName())) {
+ tr = visualDocument.createElement(HTML.TAG_TR);
+ td = visualDocument.createElement(HTML.TAG_TD);
+ tr.appendChild(td);
+ table.appendChild(tr);
+ VpeChildrenInfo info = new VpeChildrenInfo(td);
+ info.addSourceChild(child);
+ creationData.addChildrenInfo(info);
+ }
+ }
+ } else {
+ tr = visualDocument.createElement(HTML.TAG_TR);
+ table.appendChild(tr);
+ for (int i = 0; i < children.getLength(); i++) {
+ Node child = children.item(i);
+ // if children is one of visible items
+ if (CHILDREN_LIST.contains(child.getLocalName())) {
+ td = visualDocument.createElement(HTML.TAG_TD);
+ tr.appendChild(td);
+ VpeChildrenInfo info = new VpeChildrenInfo(td);
+ info.addSourceChild(child);
+ creationData.addChildrenInfo(info);
+ }
+ }
+ }
+
+ return creationData;
+ }
+
+ /**
+ * Read attributes from the source element.
+ *
+ * @param sourceNode
+ * the source node
+ */
+ private void readAttributes(Node sourceNode) {
+ Element source = (Element) sourceNode;
+ style = source.getAttribute(STYLE);
+ styleClass = source.getAttribute(STYLE_CLASS);
+ border = source.getAttribute(BORDER);
+ layout = source.getAttribute(LAYOUT);
+ }
+
+ /**
+ * Checks is attribute presents.
+ *
+ * @param attr the attribute
+ *
+ * @return true, if successful
+ */
+ private boolean attrPresents(String attr) {
+ return ((null != attr) && (!"".equals(attr)));
+ }
+
+}
Property changes on: trunk/jsf/plugins/org.jboss.tools.jsf.vpe.jsf/src/org/jboss/tools/jsf/vpe/jsf/template/JsfSelectManyCheckbox.java
___________________________________________________________________
Name: svn:mime-type
+ text/plain
Name: svn:keywords
+ Author Id Revision Date
Name: svn:eol-style
+ native
Modified: trunk/jsf/plugins/org.jboss.tools.jsf.vpe.jsf/templates/vpe-templates-jsf.xml
===================================================================
--- trunk/jsf/plugins/org.jboss.tools.jsf.vpe.jsf/templates/vpe-templates-jsf.xml 2008-02-22 15:13:22 UTC (rev 6542)
+++ trunk/jsf/plugins/org.jboss.tools.jsf.vpe.jsf/templates/vpe-templates-jsf.xml 2008-02-22 15:18:18 UTC (rev 6543)
@@ -584,9 +584,9 @@
Возможна проблема с нечувствительностью к регистру lineDirection/pageDirection (44 of 4)
-->
<vpe:tag name="h:selectManyCheckbox" case-sensitive="yes">
- <vpe:template children="yes" modify="yes">
- <vpe:grid layout="{@layout}" border="{@border}" title="{tagstring()}" style="{@style}" class="{@styleClass}"/>
- <vpe:breaker type="ignore"/>
+ <vpe:template children="yes" modify="yes"
+ class="org.jboss.tools.jsf.vpe.jsf.template.JsfSelectManyCheckbox">
+
<vpe:dnd>
<vpe:drag start-enable="yes"/>
<vpe:drop container="yes">
@@ -807,7 +807,17 @@
</vpe:tag>
<vpe:tag name="f:selectItem" case-sensitive="yes">
- <vpe:if test="hasinparents('h:selectManyCheckbox')|hasinparents('x:selectManyCheckbox')|hasinparents('t:selectManyCheckbox')">
+ <vpe:if test="hasinparents('h:selectManyCheckbox')">
+ <vpe:template children="no" modify="yes"
+ class="org.jboss.tools.jsf.vpe.jsf.template.JsfCheckboxSelectItemTemplate">
+ </vpe:template>
+ </vpe:if>
+ <vpe:if test="hasinparents('h:selectManyListbox')|hasinparents('h:selectManyMenu')">
+ <vpe:template children="no" modify="yes"
+ class="org.jboss.tools.jsf.vpe.jsf.template.JsfOptionSelectItemTemplate">
+ </vpe:template>
+ </vpe:if>
+ <vpe:if test="hasinparents('x:selectManyCheckbox')|hasinparents('t:selectManyCheckbox')">
<vpe:template children="no" modify="yes">
<span title="{tagstring()}">
<input type="checkbox" />
@@ -825,9 +835,7 @@
</vpe:template>
</vpe:if>
<vpe:if test="hasinparents('h:selectOneListbox')|
- hasinparents('h:selectManyListbox')|
hasinparents('h:selectOneMenu')|
- hasinparents('h:selectManyMenu')|
hasinparents('t:selectManyMenu')|
hasinparents('x:selectOneRadio')|
hasinparents('x:selectOneMenu')"> <!-- Gavr --><!-- added x: 8.02.05 -->
17 years, 7 months
JBoss Tools SVN: r6542 - trunk/jbpm/docs/resources/styles/en.
by jbosstools-commits＠lists.jboss.org
Author: smukhina
Date: 2008-02-22 10:13:22 -0500 (Fri, 22 Feb 2008)
New Revision: 6542
Modified:
trunk/jbpm/docs/resources/styles/en/html.css
Log:
http://jira.jboss.com/jira/browse/JBDS-200
Modified: trunk/jbpm/docs/resources/styles/en/html.css
===================================================================
--- trunk/jbpm/docs/resources/styles/en/html.css 2008-02-22 15:02:34 UTC (rev 6541)
+++ trunk/jbpm/docs/resources/styles/en/html.css 2008-02-22 15:13:22 UTC (rev 6542)
@@ -103,7 +103,7 @@
div.book div.mediaobject{
-text-align:center;
+text-align:left;
}
div.mediaobject, div.mediaobject img *{
17 years, 7 months
JBoss Tools SVN: r6541 - trunk/seam/plugins/org.jboss.tools.seam.xml/resources/meta.
by jbosstools-commits＠lists.jboss.org
Author: scabanovich
Date: 2008-02-22 10:02:34 -0500 (Fri, 22 Feb 2008)
New Revision: 6541
Modified:
trunk/seam/plugins/org.jboss.tools.seam.xml/resources/meta/seam-drools.meta
Log:
JBIDE-1453
Modified: trunk/seam/plugins/org.jboss.tools.seam.xml/resources/meta/seam-drools.meta
===================================================================
--- trunk/seam/plugins/org.jboss.tools.seam.xml/resources/meta/seam-drools.meta 2008-02-22 14:57:10 UTC (rev 6540)
+++ trunk/seam/plugins/org.jboss.tools.seam.xml/resources/meta/seam-drools.meta 2008-02-22 15:02:34 UTC (rev 6541)
@@ -266,9 +266,9 @@
<XEntityExtension name="FileSeamComponents12_EditorActionList">
<XChildrenEntities/>
<XActionItem kind="list">
- <XActionItem ICON="action.empty" displayName="New" group="1"
- kind="list" name="CreateActions">
- <XActionItem ICON="action.empty" displayName="Drools" kind="list" name="Drools">
+ <XActionItem ICON="action.empty" displayName="New" kind="list" name="CreateActions">
+ <XActionItem ICON="action.empty" displayName="Drools" group="1"
+ kind="list" name="Drools">
<XActionItem HandlerClassName="%Create%" ICON="action.empty"
PROPERTIES="validator.add=true" WizardClassName="%Default%"
displayName="Managed Working Memory..." kind="action" name="AddManagedWorkingMemory">
17 years, 7 months
JBoss Tools SVN: r6540 - in trunk/jsf/tests/org.jboss.tools.jsf.vpe.jsf.test: src/org/jboss/tools/jsf/vpe/jsf/test/jbide and 1 other directory.
by jbosstools-commits＠lists.jboss.org
Author: mareshkau
Date: 2008-02-22 09:57:10 -0500 (Fri, 22 Feb 2008)
New Revision: 6540
Added:
trunk/jsf/tests/org.jboss.tools.jsf.vpe.jsf.test/resources/jsfTest/WebContent/pages/JBIDE/675/testUserInputOnTag.xhtml
Modified:
trunk/jsf/tests/org.jboss.tools.jsf.vpe.jsf.test/resources/jsfTest/WebContent/pages/JBIDE/675/testChangeOnUserInputTextNode.xhtml
trunk/jsf/tests/org.jboss.tools.jsf.vpe.jsf.test/src/org/jboss/tools/jsf/vpe/jsf/test/jbide/JBIDE675Test.java
Log:
http://jira.jboss.com/jira/browse/JBIDE-675, junit tests
Modified: trunk/jsf/tests/org.jboss.tools.jsf.vpe.jsf.test/resources/jsfTest/WebContent/pages/JBIDE/675/testChangeOnUserInputTextNode.xhtml
===================================================================
--- trunk/jsf/tests/org.jboss.tools.jsf.vpe.jsf.test/resources/jsfTest/WebContent/pages/JBIDE/675/testChangeOnUserInputTextNode.xhtml 2008-02-22 14:56:56 UTC (rev 6539)
+++ trunk/jsf/tests/org.jboss.tools.jsf.vpe.jsf.test/resources/jsfTest/WebContent/pages/JBIDE/675/testChangeOnUserInputTextNode.xhtml 2008-02-22 14:57:10 UTC (rev 6540)
@@ -6,9 +6,7 @@
<input type="text" src=""/>
<div>
<h2>here tests Input of Plain Text by user</h2>
- <img src="#{facesContext.externalContext.requestContextPath}/images/header.gif"/>
Txt1 Txt2
</div>
- </form>
</body>
</html>
\ No newline at end of file
Added: trunk/jsf/tests/org.jboss.tools.jsf.vpe.jsf.test/resources/jsfTest/WebContent/pages/JBIDE/675/testUserInputOnTag.xhtml
===================================================================
--- trunk/jsf/tests/org.jboss.tools.jsf.vpe.jsf.test/resources/jsfTest/WebContent/pages/JBIDE/675/testUserInputOnTag.xhtml (rev 0)
+++ trunk/jsf/tests/org.jboss.tools.jsf.vpe.jsf.test/resources/jsfTest/WebContent/pages/JBIDE/675/testUserInputOnTag.xhtml 2008-02-22 14:57:10 UTC (rev 6540)
@@ -0,0 +1,11 @@
+<!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:h="http://java.sun.com/jsf/html"
+ xmlns:f="http://java.sun.com/jsf/core">
+ <body>
+ <form action="">
+ <h1>Tag Input</h1>
+ <test />
+ </form>
+ </body>
+</html>
\ 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/jbide/JBIDE675Test.java
===================================================================
--- trunk/jsf/tests/org.jboss.tools.jsf.vpe.jsf.test/src/org/jboss/tools/jsf/vpe/jsf/test/jbide/JBIDE675Test.java 2008-02-22 14:56:56 UTC (rev 6539)
+++ trunk/jsf/tests/org.jboss.tools.jsf.vpe.jsf.test/src/org/jboss/tools/jsf/vpe/jsf/test/jbide/JBIDE675Test.java 2008-02-22 14:57:10 UTC (rev 6540)
@@ -1,13 +1,13 @@
/*******************************************************************************
-* 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.test.jbide;
import org.eclipse.core.resources.IFile;
@@ -29,18 +29,19 @@
* @author mareshkau
*
*/
-public class JBIDE675Test extends VpeTest{
+public class JBIDE675Test extends VpeTest {
private static final String IMPORT_PROJECT_NAME = "jsfTest";
-
+
private static final String TEST_PAGE_NAME = "JBIDE/675/testChangeOnUserInputTextNode.xhtml";
-
+
public JBIDE675Test(String name) {
super(name);
}
-
+
/**
* Tests Base Input on Source Page
+ *
* @throws Throwable
*/
public void testBaseTextInputOnPage() throws Throwable {
@@ -48,51 +49,109 @@
TestUtil.waitForJobs();
// set exception
setException(null);
- //Tests CA
+ // Tests CA
// get test page path
IFile file = (IFile) TestUtil.getComponentPath(TEST_PAGE_NAME,
IMPORT_PROJECT_NAME);
- assertNotNull("Could not open specified file " + TEST_PAGE_NAME,
- file);
+ assertNotNull("Could not open specified file " + TEST_PAGE_NAME, file);
IEditorInput input = new FileEditorInput(file);
assertNotNull("Editor input is null", input);
-
+
// open and get editor
JSPMultiPageEditor part = openEditor(input);
-
- StyledText styledText = part.getSourceEditor().getTextViewer().getTextWidget();
-
- for(int i=0;i<20;i++) {
+
+ StyledText styledText = part.getSourceEditor().getTextViewer()
+ .getTextWidget();
+
+ for (int i = 0; i < 20; i++) {
+
+ styledText.setCaretOffset(339);
+ IndexedRegion treeNode = ContentAssistUtils.getNodeAt(part
+ .getSourceEditor().getTextViewer(), 339);
+ Node node = (Node) treeNode;
+ assertNotNull(node);
+
+ VpeController vpeController = getVpeController(part);
+
+ VpeDomMapping domMapping = vpeController.getDomMapping();
+
+ VpeNodeMapping nodeMapping = domMapping.getNodeMapping(node);
+
+ assertNotNull(nodeMapping);
+
+ nsIDOMNode span = nodeMapping.getVisualNode();
+
+ nsIDOMNode textNode = span.getFirstChild();
+
+ assertEquals(textNode.getNodeType(), nsIDOMNode.TEXT_NODE);
+
+ assertNotNull(textNode.getNodeValue());
+
+ assertEquals(textNode.getNodeValue().trim(), node.getNodeValue()
+ .trim());
+
+ styledText.insert("t");
+ }
+ }
+ /**
+ * Tests tag Input on Source Page
+ *
+ * @throws Throwable
+ */
+ public void testBaseTagInputOnPage() throws Throwable {
+ // wait
+ TestUtil.waitForJobs();
+ // set exception
+ setException(null);
+ // Tests CA
+ // get test page path
+ IFile file = (IFile) TestUtil.getComponentPath("JBIDE/675/testUserInputOnTag.xhtml",
+ IMPORT_PROJECT_NAME);
+ assertNotNull("Could not open specified file " + "JBIDE/675/testUserInputOnTag.xhtml", file);
+
+ IEditorInput input = new FileEditorInput(file);
+
+ assertNotNull("Editor input is null", input);
+
+ // open and get editor
+ JSPMultiPageEditor part = openEditor(input);
+
+ StyledText styledText = part.getSourceEditor().getTextViewer()
+ .getTextWidget();
+
+ for (int i = 0; i < 20; i++) {
+
+ styledText.setCaretOffset(311);
+ IndexedRegion treeNode = ContentAssistUtils.getNodeAt(part
+ .getSourceEditor().getTextViewer(), 311);
+ Node node = (Node) treeNode;
+ assertNotNull(node);
+
+ VpeController vpeController = getVpeController(part);
+
+ VpeDomMapping domMapping = vpeController.getDomMapping();
+
+ VpeNodeMapping nodeMapping = domMapping.getNodeMapping(node);
+
+ assertNotNull(nodeMapping);
+
+ nsIDOMNode div = nodeMapping.getVisualNode();
+
+ nsIDOMNode span = div.getFirstChild();
+ nsIDOMNode textNode = span.getFirstChild();
- styledText.setCaretOffset(339);
- IndexedRegion treeNode = ContentAssistUtils.getNodeAt(part.getSourceEditor().getTextViewer(), 339);
- Node node = (Node) treeNode;
- assertNotNull(node);
-
- VpeController vpeController = getVpeController(part);
-
- VpeDomMapping domMapping = vpeController.getDomMapping();
-
- VpeNodeMapping nodeMapping = domMapping.getNodeMapping(node);
-
- assertNotNull(nodeMapping);
-
- nsIDOMNode span = nodeMapping.getVisualNode();
-
- nsIDOMNode textNode = span.getFirstChild();
-
- assertEquals(textNode.getNodeType(), nsIDOMNode.TEXT_NODE);
-
- assertNotNull(textNode.getNodeValue());
-
- assertEquals(textNode.getNodeValue().trim(), node.getNodeValue().trim());
-
- styledText.insert("t");
+ assertEquals(textNode.getNodeType(), nsIDOMNode.TEXT_NODE);
+
+ assertNotNull(textNode.getNodeValue());
+ assertNotNull(node.getNodeName());
+ assertEquals(textNode.getNodeValue().trim(), node.getNodeName()
+ .trim());
+
+ styledText.insert("t");
+ }
}
-
- TestUtil.delay(5000L);
- }
+
}
17 years, 7 months
JBoss Tools SVN: r6539 - trunk/seam/plugins/org.jboss.tools.seam.ui.
by jbosstools-commits＠lists.jboss.org
Author: dazarov
Date: 2008-02-22 09:56:56 -0500 (Fri, 22 Feb 2008)
New Revision: 6539
Modified:
trunk/seam/plugins/org.jboss.tools.seam.ui/plugin.xml
Log:
http://jira.jboss.com/jira/browse/JBIDE-518
Modified: trunk/seam/plugins/org.jboss.tools.seam.ui/plugin.xml
===================================================================
--- trunk/seam/plugins/org.jboss.tools.seam.ui/plugin.xml 2008-02-22 14:56:23 UTC (rev 6538)
+++ trunk/seam/plugins/org.jboss.tools.seam.ui/plugin.xml 2008-02-22 14:56:56 UTC (rev 6539)
@@ -452,7 +452,7 @@
<key
commandId="org.jboss.tools.seam.ui.open.component"
schemeId="org.eclipse.ui.defaultAcceleratorConfiguration"
- sequence="M1+M2+Y">
+ sequence="M1+M2+Z">
</key>
</extension>
</plugin>
17 years, 7 months
JBoss Tools SVN: r6538 - trunk/seam/plugins/org.jboss.tools.seam.xml/resources/meta.
by jbosstools-commits＠lists.jboss.org
Author: scabanovich
Date: 2008-02-22 09:56:23 -0500 (Fri, 22 Feb 2008)
New Revision: 6538
Modified:
trunk/seam/plugins/org.jboss.tools.seam.xml/resources/meta/seam-async.meta
trunk/seam/plugins/org.jboss.tools.seam.xml/resources/meta/seam-components.meta
trunk/seam/plugins/org.jboss.tools.seam.xml/resources/meta/seam-core.meta
trunk/seam/plugins/org.jboss.tools.seam.xml/resources/meta/seam-drools.meta
trunk/seam/plugins/org.jboss.tools.seam.xml/resources/meta/seam-framework.meta
trunk/seam/plugins/org.jboss.tools.seam.xml/resources/meta/seam-international.meta
trunk/seam/plugins/org.jboss.tools.seam.xml/resources/meta/seam-jms.meta
trunk/seam/plugins/org.jboss.tools.seam.xml/resources/meta/seam-mail.meta
trunk/seam/plugins/org.jboss.tools.seam.xml/resources/meta/seam-pdf.meta
trunk/seam/plugins/org.jboss.tools.seam.xml/resources/meta/seam-persistence.meta
trunk/seam/plugins/org.jboss.tools.seam.xml/resources/meta/seam-remoting.meta
trunk/seam/plugins/org.jboss.tools.seam.xml/resources/meta/seam-security.meta
trunk/seam/plugins/org.jboss.tools.seam.xml/resources/meta/seam-spring.meta
trunk/seam/plugins/org.jboss.tools.seam.xml/resources/meta/seam-theme.meta
trunk/seam/plugins/org.jboss.tools.seam.xml/resources/meta/seam-transaction.meta
trunk/seam/plugins/org.jboss.tools.seam.xml/resources/meta/seam-web.meta
Log:
JBIDE-1453
Modified: trunk/seam/plugins/org.jboss.tools.seam.xml/resources/meta/seam-async.meta
===================================================================
--- trunk/seam/plugins/org.jboss.tools.seam.xml/resources/meta/seam-async.meta 2008-02-22 14:01:44 UTC (rev 6537)
+++ trunk/seam/plugins/org.jboss.tools.seam.xml/resources/meta/seam-async.meta 2008-02-22 14:56:23 UTC (rev 6538)
@@ -213,8 +213,7 @@
<XEntityExtension name="FileSeamComponents20_EditorActionList">
<XChildrenEntities/>
<XActionItem kind="list">
- <XActionItem ICON="action.empty" displayName="New" group="1"
- kind="list" name="CreateActions">
+ <XActionItem ICON="action.empty" displayName="New" kind="list" name="CreateActions">
<XActionItem ICON="action.empty" displayName="Async" group="1"
kind="list" name="Async">
<XActionItem HandlerClassName="%Create%" ICON="action.empty"
Modified: trunk/seam/plugins/org.jboss.tools.seam.xml/resources/meta/seam-components.meta
===================================================================
--- trunk/seam/plugins/org.jboss.tools.seam.xml/resources/meta/seam-components.meta 2008-02-22 14:01:44 UTC (rev 6537)
+++ trunk/seam/plugins/org.jboss.tools.seam.xml/resources/meta/seam-components.meta 2008-02-22 14:56:23 UTC (rev 6538)
@@ -587,7 +587,7 @@
<XEntityRenderer/>
<XModelAttributes/>
<XActionItem kind="list">
- <XActionItem displayName="New" group="1" kind="list" name="CreateActions">
+ <XActionItem displayName="New" kind="list" name="CreateActions">
<XActionItem HandlerClassName="%Create%"
ICON="action.new.struts.webapp.res_ref"
PROPERTIES="validator.add=true" WizardClassName="%Default%"
@@ -614,8 +614,8 @@
</XActionItem>
</XActionItem>
<XActionItem ICON="action.empty" kind="list" name="Properties">
- <XActionItem HandlerClassName="%Properties%" ICON="action.empty"
- displayName="Properties..." kind="action" name="Properties"/>
+ <XActionItem HIDE="always" HandlerClassName="%Properties%"
+ ICON="action.empty" displayName="Properties..." kind="action" name="Properties"/>
</XActionItem>
<XActionItem kind="list" name="VerifyActions">
<XActionItem kind="list" name="StaticActions"/>
@@ -771,7 +771,7 @@
<XEntityRenderer/>
<XModelAttributes/>
<XActionItem kind="list">
- <XActionItem displayName="New" group="1" kind="list" name="CreateActions">
+ <XActionItem displayName="New" kind="list" name="CreateActions">
<XActionItem HandlerClassName="%Create%"
ICON="action.new.struts.webapp.res_ref"
PROPERTIES="validator.add=true" WizardClassName="%Default%"
@@ -798,8 +798,8 @@
</XActionItem>
</XActionItem>
<XActionItem ICON="action.empty" kind="list" name="Properties">
- <XActionItem HandlerClassName="%Properties%" ICON="action.empty"
- displayName="Properties..." kind="action" name="Properties"/>
+ <XActionItem HIDE="always" HandlerClassName="%Properties%"
+ ICON="action.empty" displayName="Properties..." kind="action" name="Properties"/>
</XActionItem>
<XActionItem kind="list" name="VerifyActions">
<XActionItem kind="list" name="StaticActions"/>
@@ -962,7 +962,7 @@
<XEntityRenderer/>
<XModelAttributes/>
<XActionItem kind="list">
- <XActionItem displayName="New" group="1" kind="list" name="CreateActions">
+ <XActionItem displayName="New" kind="list" name="CreateActions">
<XActionItem HandlerClassName="%Create%"
ICON="action.new.struts.webapp.res_ref"
PROPERTIES="validator.add=true" WizardClassName="%Default%"
@@ -995,8 +995,8 @@
</XActionItem>
</XActionItem>
<XActionItem ICON="action.empty" kind="list" name="Properties">
- <XActionItem HandlerClassName="%Properties%" ICON="action.empty"
- displayName="Properties..." kind="action" name="Properties"/>
+ <XActionItem HIDE="always" HandlerClassName="%Properties%"
+ ICON="action.empty" displayName="Properties..." kind="action" name="Properties"/>
</XActionItem>
<XActionItem kind="list" name="VerifyActions">
<XActionItem kind="list" name="StaticActions"/>
Modified: trunk/seam/plugins/org.jboss.tools.seam.xml/resources/meta/seam-core.meta
===================================================================
--- trunk/seam/plugins/org.jboss.tools.seam.xml/resources/meta/seam-core.meta 2008-02-22 14:01:44 UTC (rev 6537)
+++ trunk/seam/plugins/org.jboss.tools.seam.xml/resources/meta/seam-core.meta 2008-02-22 14:56:23 UTC (rev 6538)
@@ -1620,8 +1620,7 @@
<XEntityExtension name="FileSeamComponents12_EditorActionList">
<XChildrenEntities/>
<XActionItem kind="list">
- <XActionItem ICON="action.empty" displayName="New" group="1"
- kind="list" name="CreateActions">
+ <XActionItem ICON="action.empty" displayName="New" kind="list" name="CreateActions">
<XActionItem ICON="action.empty" displayName="Core" group="1"
kind="list" name="Core">
<XActionItem HandlerClassName="%Create%" ICON="action.empty"
@@ -1825,8 +1824,7 @@
<XEntityExtension name="FileSeamComponents20_EditorActionList">
<XChildrenEntities/>
<XActionItem kind="list">
- <XActionItem ICON="action.empty" displayName="New" group="1"
- kind="list" name="CreateActions">
+ <XActionItem ICON="action.empty" displayName="New" kind="list" name="CreateActions">
<XActionItem ICON="action.empty" displayName="Core" group="1"
kind="list" name="Core">
<XActionItem HandlerClassName="%Create%" ICON="action.empty"
Modified: trunk/seam/plugins/org.jboss.tools.seam.xml/resources/meta/seam-drools.meta
===================================================================
--- trunk/seam/plugins/org.jboss.tools.seam.xml/resources/meta/seam-drools.meta 2008-02-22 14:01:44 UTC (rev 6537)
+++ trunk/seam/plugins/org.jboss.tools.seam.xml/resources/meta/seam-drools.meta 2008-02-22 14:56:23 UTC (rev 6538)
@@ -268,8 +268,7 @@
<XActionItem kind="list">
<XActionItem ICON="action.empty" displayName="New" group="1"
kind="list" name="CreateActions">
- <XActionItem ICON="action.empty" displayName="Drools" group="1"
- kind="list" name="Drools">
+ <XActionItem ICON="action.empty" displayName="Drools" kind="list" name="Drools">
<XActionItem HandlerClassName="%Create%" ICON="action.empty"
PROPERTIES="validator.add=true" WizardClassName="%Default%"
displayName="Managed Working Memory..." kind="action" name="AddManagedWorkingMemory">
@@ -332,8 +331,7 @@
<XEntityExtension name="FileSeamComponents20_EditorActionList">
<XChildrenEntities/>
<XActionItem kind="list">
- <XActionItem ICON="action.empty" displayName="New" group="1"
- kind="list" name="CreateActions">
+ <XActionItem ICON="action.empty" displayName="New" kind="list" name="CreateActions">
<XActionItem ICON="action.empty" displayName="Drools" group="1"
kind="list" name="Drools">
<XActionItem HandlerClassName="%Create%" ICON="action.empty"
Modified: trunk/seam/plugins/org.jboss.tools.seam.xml/resources/meta/seam-framework.meta
===================================================================
--- trunk/seam/plugins/org.jboss.tools.seam.xml/resources/meta/seam-framework.meta 2008-02-22 14:01:44 UTC (rev 6537)
+++ trunk/seam/plugins/org.jboss.tools.seam.xml/resources/meta/seam-framework.meta 2008-02-22 14:56:23 UTC (rev 6538)
@@ -43,7 +43,7 @@
<Editor name="Uneditable"/>
</XModelAttribute>
<XModelAttribute PROPERTIES="id=true;category=general"
- default="ejbql" name="name">
+ default="ejbql" name="name" visibility="false">
<Editor name="Uneditable"/>
</XModelAttribute>
<XModelAttribute PROPERTIES="category=general" name="value" xmlname="#text"/>
@@ -373,7 +373,7 @@
<Editor name="Uneditable"/>
</XModelAttribute>
<XModelAttribute PROPERTIES="id=true;category=general"
- default="order" name="name">
+ default="order" name="name" visibility="false">
<Editor name="Uneditable"/>
</XModelAttribute>
<XModelAttribute PROPERTIES="category=general" name="value" xmlname="#text"/>
@@ -513,8 +513,7 @@
<XEntityExtension name="FileSeamComponents12_EditorActionList">
<XChildrenEntities/>
<XActionItem kind="list">
- <XActionItem ICON="action.empty" displayName="New" group="1"
- kind="list" name="CreateActions">
+ <XActionItem ICON="action.empty" displayName="New" kind="list" name="CreateActions">
<XActionItem ICON="action.empty" displayName="Framework" group="1"
kind="list" name="Framework">
<XActionItem HandlerClassName="%Create%" ICON="action.empty"
@@ -604,8 +603,7 @@
<XEntityExtension name="FileSeamComponents20_EditorActionList">
<XChildrenEntities/>
<XActionItem kind="list">
- <XActionItem ICON="action.empty" displayName="New" group="1"
- kind="list" name="CreateActions">
+ <XActionItem ICON="action.empty" displayName="New" kind="list" name="CreateActions">
<XActionItem ICON="action.empty" displayName="Framework" group="1"
kind="list" name="Framework">
<XActionItem HandlerClassName="%Create%" ICON="action.empty"
Modified: trunk/seam/plugins/org.jboss.tools.seam.xml/resources/meta/seam-international.meta
===================================================================
--- trunk/seam/plugins/org.jboss.tools.seam.xml/resources/meta/seam-international.meta 2008-02-22 14:01:44 UTC (rev 6537)
+++ trunk/seam/plugins/org.jboss.tools.seam.xml/resources/meta/seam-international.meta 2008-02-22 14:56:23 UTC (rev 6538)
@@ -170,8 +170,7 @@
<XEntityExtension name="FileSeamComponents20_EditorActionList">
<XChildrenEntities/>
<XActionItem kind="list">
- <XActionItem ICON="action.empty" displayName="New" group="1"
- kind="list" name="CreateActions">
+ <XActionItem ICON="action.empty" displayName="New" kind="list" name="CreateActions">
<XActionItem ICON="action.empty" displayName="International"
group="1" kind="list" name="International">
<XActionItem HandlerClassName="%Create%" ICON="action.empty"
Modified: trunk/seam/plugins/org.jboss.tools.seam.xml/resources/meta/seam-jms.meta
===================================================================
--- trunk/seam/plugins/org.jboss.tools.seam.xml/resources/meta/seam-jms.meta 2008-02-22 14:01:44 UTC (rev 6537)
+++ trunk/seam/plugins/org.jboss.tools.seam.xml/resources/meta/seam-jms.meta 2008-02-22 14:56:23 UTC (rev 6538)
@@ -266,8 +266,7 @@
<XEntityExtension name="FileSeamComponents12_EditorActionList">
<XChildrenEntities/>
<XActionItem kind="list">
- <XActionItem ICON="action.empty" displayName="New" group="1"
- kind="list" name="CreateActions">
+ <XActionItem ICON="action.empty" displayName="New" kind="list" name="CreateActions">
<XActionItem ICON="action.empty" displayName="JMS" group="1"
kind="list" name="JMS">
<XActionItem HandlerClassName="%Create%" ICON="action.empty"
@@ -314,8 +313,7 @@
<XChildEntity name="SeamJmsQueueSender"/>
</XChildrenEntities>
<XActionItem kind="list">
- <XActionItem ICON="action.empty" displayName="New" group="1"
- kind="list" name="CreateActions">
+ <XActionItem ICON="action.empty" displayName="New" kind="list" name="CreateActions">
<XActionItem ICON="action.empty" displayName="JMS" group="1"
kind="list" name="JMS">
<XActionItem HandlerClassName="%Create%" ICON="action.empty"
Modified: trunk/seam/plugins/org.jboss.tools.seam.xml/resources/meta/seam-mail.meta
===================================================================
--- trunk/seam/plugins/org.jboss.tools.seam.xml/resources/meta/seam-mail.meta 2008-02-22 14:01:44 UTC (rev 6537)
+++ trunk/seam/plugins/org.jboss.tools.seam.xml/resources/meta/seam-mail.meta 2008-02-22 14:56:23 UTC (rev 6538)
@@ -342,8 +342,7 @@
<XEntityExtension name="FileSeamComponents12_EditorActionList">
<XChildrenEntities/>
<XActionItem kind="list">
- <XActionItem ICON="action.empty" displayName="New" group="1"
- kind="list" name="CreateActions">
+ <XActionItem ICON="action.empty" displayName="New" kind="list" name="CreateActions">
<XActionItem ICON="action.empty" displayName="Mail" group="1"
kind="list" name="Mail">
<XActionItem HandlerClassName="%Create%" ICON="action.empty"
@@ -402,8 +401,7 @@
<XEntityExtension name="FileSeamComponents20_EditorActionList">
<XChildrenEntities/>
<XActionItem kind="list">
- <XActionItem ICON="action.empty" displayName="New" group="1"
- kind="list" name="CreateActions">
+ <XActionItem ICON="action.empty" displayName="New" kind="list" name="CreateActions">
<XActionItem ICON="action.empty" displayName="Mail" group="1"
kind="list" name="Mail">
<XActionItem HandlerClassName="%Create%" ICON="action.empty"
Modified: trunk/seam/plugins/org.jboss.tools.seam.xml/resources/meta/seam-pdf.meta
===================================================================
--- trunk/seam/plugins/org.jboss.tools.seam.xml/resources/meta/seam-pdf.meta 2008-02-22 14:01:44 UTC (rev 6537)
+++ trunk/seam/plugins/org.jboss.tools.seam.xml/resources/meta/seam-pdf.meta 2008-02-22 14:56:23 UTC (rev 6538)
@@ -156,8 +156,7 @@
<XEntityExtension name="FileSeamComponents12_EditorActionList">
<XChildrenEntities/>
<XActionItem kind="list">
- <XActionItem ICON="action.empty" displayName="New" group="1"
- kind="list" name="CreateActions">
+ <XActionItem ICON="action.empty" displayName="New" kind="list" name="CreateActions">
<XActionItem ICON="action.empty" displayName="Pdf" group="1"
kind="list" name="Pdf">
<XActionItem HandlerClassName="%Create%" ICON="action.empty"
@@ -213,8 +212,7 @@
<XEntityExtension name="FileSeamComponents20_EditorActionList">
<XChildrenEntities/>
<XActionItem kind="list">
- <XActionItem ICON="action.empty" displayName="New" group="1"
- kind="list" name="CreateActions">
+ <XActionItem ICON="action.empty" displayName="New" kind="list" name="CreateActions">
<XActionItem ICON="action.empty" displayName="Pdf" group="1"
kind="list" name="Pdf">
<XActionItem HandlerClassName="%Create%" ICON="action.empty"
Modified: trunk/seam/plugins/org.jboss.tools.seam.xml/resources/meta/seam-persistence.meta
===================================================================
--- trunk/seam/plugins/org.jboss.tools.seam.xml/resources/meta/seam-persistence.meta 2008-02-22 14:01:44 UTC (rev 6537)
+++ trunk/seam/plugins/org.jboss.tools.seam.xml/resources/meta/seam-persistence.meta 2008-02-22 14:56:23 UTC (rev 6538)
@@ -861,8 +861,7 @@
<XEntityExtension name="FileSeamComponents20_EditorActionList">
<XChildrenEntities/>
<XActionItem kind="list">
- <XActionItem ICON="action.empty" displayName="New" group="1"
- kind="list" name="CreateActions">
+ <XActionItem ICON="action.empty" displayName="New" kind="list" name="CreateActions">
<XActionItem ICON="action.empty" displayName="Persistence" group="1"
kind="list" name="Persistence">
<XActionItem HandlerClassName="%Create%" ICON="action.empty"
Modified: trunk/seam/plugins/org.jboss.tools.seam.xml/resources/meta/seam-remoting.meta
===================================================================
--- trunk/seam/plugins/org.jboss.tools.seam.xml/resources/meta/seam-remoting.meta 2008-02-22 14:01:44 UTC (rev 6537)
+++ trunk/seam/plugins/org.jboss.tools.seam.xml/resources/meta/seam-remoting.meta 2008-02-22 14:56:23 UTC (rev 6538)
@@ -110,8 +110,7 @@
<XEntityExtension name="FileSeamComponents12_EditorActionList">
<XChildrenEntities/>
<XActionItem kind="list">
- <XActionItem ICON="action.empty" displayName="New" group="1"
- kind="list" name="CreateActions">
+ <XActionItem ICON="action.empty" displayName="New" kind="list" name="CreateActions">
<XActionItem ICON="action.empty" displayName="Remoting" group="1"
kind="list" name="Remoting">
<XActionItem HandlerClassName="%Create%" ICON="action.empty"
@@ -154,8 +153,7 @@
<XEntityExtension name="FileSeamComponents20_EditorActionList">
<XChildrenEntities/>
<XActionItem kind="list">
- <XActionItem ICON="action.empty" displayName="New" group="1"
- kind="list" name="CreateActions">
+ <XActionItem ICON="action.empty" displayName="New" kind="list" name="CreateActions">
<XActionItem ICON="action.empty" displayName="Remoting" group="1"
kind="list" name="Remoting">
<XActionItem HandlerClassName="%Create%" ICON="action.empty"
Modified: trunk/seam/plugins/org.jboss.tools.seam.xml/resources/meta/seam-security.meta
===================================================================
--- trunk/seam/plugins/org.jboss.tools.seam.xml/resources/meta/seam-security.meta 2008-02-22 14:01:44 UTC (rev 6537)
+++ trunk/seam/plugins/org.jboss.tools.seam.xml/resources/meta/seam-security.meta 2008-02-22 14:56:23 UTC (rev 6538)
@@ -173,8 +173,7 @@
<XEntityExtension name="FileSeamComponents12_EditorActionList">
<XChildrenEntities/>
<XActionItem kind="list">
- <XActionItem ICON="action.empty" displayName="New" group="1"
- kind="list" name="CreateActions">
+ <XActionItem ICON="action.empty" displayName="New" kind="list" name="CreateActions">
<XActionItem ICON="action.empty" displayName="Security" group="1"
kind="list" name="Security">
<XActionItem HandlerClassName="%Create%" ICON="action.empty"
@@ -215,8 +214,7 @@
<XEntityExtension name="FileSeamComponents20_EditorActionList">
<XChildrenEntities/>
<XActionItem kind="list">
- <XActionItem ICON="action.empty" displayName="New" group="1"
- kind="list" name="CreateActions">
+ <XActionItem ICON="action.empty" displayName="New" kind="list" name="CreateActions">
<XActionItem ICON="action.empty" displayName="Security" group="1"
kind="list" name="Security">
<XActionItem HandlerClassName="%Create%" ICON="action.empty"
Modified: trunk/seam/plugins/org.jboss.tools.seam.xml/resources/meta/seam-spring.meta
===================================================================
--- trunk/seam/plugins/org.jboss.tools.seam.xml/resources/meta/seam-spring.meta 2008-02-22 14:01:44 UTC (rev 6537)
+++ trunk/seam/plugins/org.jboss.tools.seam.xml/resources/meta/seam-spring.meta 2008-02-22 14:56:23 UTC (rev 6538)
@@ -276,8 +276,7 @@
<XEntityExtension name="FileSeamComponents12_EditorActionList">
<XChildrenEntities/>
<XActionItem kind="list">
- <XActionItem ICON="action.empty" displayName="New" group="1"
- kind="list" name="CreateActions">
+ <XActionItem ICON="action.empty" displayName="New" kind="list" name="CreateActions">
<XActionItem ICON="action.empty" displayName="Spring" group="1"
kind="list" name="Spring">
<XActionItem HandlerClassName="%Create%" ICON="action.empty"
@@ -334,8 +333,7 @@
<XEntityExtension name="FileSeamComponents20_EditorActionList">
<XChildrenEntities/>
<XActionItem kind="list">
- <XActionItem ICON="action.empty" displayName="New" group="1"
- kind="list" name="CreateActions">
+ <XActionItem ICON="action.empty" displayName="New" kind="list" name="CreateActions">
<XActionItem ICON="action.empty" displayName="Spring" group="1"
kind="list" name="Spring">
<XActionItem HandlerClassName="%Create%" ICON="action.empty"
Modified: trunk/seam/plugins/org.jboss.tools.seam.xml/resources/meta/seam-theme.meta
===================================================================
--- trunk/seam/plugins/org.jboss.tools.seam.xml/resources/meta/seam-theme.meta 2008-02-22 14:01:44 UTC (rev 6537)
+++ trunk/seam/plugins/org.jboss.tools.seam.xml/resources/meta/seam-theme.meta 2008-02-22 14:56:23 UTC (rev 6538)
@@ -224,8 +224,7 @@
<XEntityExtension name="FileSeamComponents12_EditorActionList">
<XChildrenEntities/>
<XActionItem kind="list">
- <XActionItem ICON="action.empty" displayName="New" group="1"
- kind="list" name="CreateActions">
+ <XActionItem ICON="action.empty" displayName="New" kind="list" name="CreateActions">
<XActionItem ICON="action.empty" displayName="Theme" group="1"
kind="list" name="Theme">
<XActionItem HandlerClassName="%Create%" ICON="action.empty"
@@ -264,8 +263,7 @@
<XEntityExtension name="FileSeamComponents20_EditorActionList">
<XChildrenEntities/>
<XActionItem kind="list">
- <XActionItem ICON="action.empty" displayName="New" group="1"
- kind="list" name="CreateActions">
+ <XActionItem ICON="action.empty" displayName="New" kind="list" name="CreateActions">
<XActionItem ICON="action.empty" displayName="Theme" group="1"
kind="list" name="Theme">
<XActionItem HandlerClassName="%Create%" ICON="action.empty"
Modified: trunk/seam/plugins/org.jboss.tools.seam.xml/resources/meta/seam-transaction.meta
===================================================================
--- trunk/seam/plugins/org.jboss.tools.seam.xml/resources/meta/seam-transaction.meta 2008-02-22 14:01:44 UTC (rev 6537)
+++ trunk/seam/plugins/org.jboss.tools.seam.xml/resources/meta/seam-transaction.meta 2008-02-22 14:56:23 UTC (rev 6538)
@@ -265,8 +265,7 @@
<XEntityExtension name="FileSeamComponents20_EditorActionList">
<XChildrenEntities/>
<XActionItem kind="list">
- <XActionItem ICON="action.empty" displayName="New" group="1"
- kind="list" name="CreateActions">
+ <XActionItem ICON="action.empty" displayName="New" kind="list" name="CreateActions">
<XActionItem ICON="action.empty" displayName="Transaction" group="1"
kind="list" name="Transaction">
<XActionItem HandlerClassName="%Create%" ICON="action.empty"
Modified: trunk/seam/plugins/org.jboss.tools.seam.xml/resources/meta/seam-web.meta
===================================================================
--- trunk/seam/plugins/org.jboss.tools.seam.xml/resources/meta/seam-web.meta 2008-02-22 14:01:44 UTC (rev 6537)
+++ trunk/seam/plugins/org.jboss.tools.seam.xml/resources/meta/seam-web.meta 2008-02-22 14:56:23 UTC (rev 6538)
@@ -557,8 +557,7 @@
<XEntityExtension name="FileSeamComponents12_EditorActionList">
<XChildrenEntities/>
<XActionItem kind="list">
- <XActionItem ICON="action.empty" displayName="New" group="1"
- kind="list" name="CreateActions">
+ <XActionItem ICON="action.empty" displayName="New" kind="list" name="CreateActions">
<XActionItem ICON="action.empty" displayName="Web" group="1"
kind="list" name="Web">
<XActionItem HandlerClassName="%Create%" ICON="action.empty"
@@ -693,8 +692,7 @@
<XEntityExtension name="FileSeamComponents20_EditorActionList">
<XChildrenEntities/>
<XActionItem kind="list">
- <XActionItem ICON="action.empty" displayName="New" group="1"
- kind="list" name="CreateActions">
+ <XActionItem ICON="action.empty" displayName="New" kind="list" name="CreateActions">
<XActionItem ICON="action.empty" displayName="Web" group="1"
kind="list" name="Web">
<XActionItem HandlerClassName="%Create%" ICON="action.empty"
17 years, 7 months
JBoss Tools SVN: r6537 - trunk/seam/plugins/org.jboss.tools.seam.core/src/org/jboss/tools/seam/internal/core/el.
by jbosstools-commits＠lists.jboss.org
Author: akazakov
Date: 2008-02-22 09:01:44 -0500 (Fri, 22 Feb 2008)
New Revision: 6537
Modified:
trunk/seam/plugins/org.jboss.tools.seam.core/src/org/jboss/tools/seam/internal/core/el/SeamELCompletionEngine.java
Log:
http://jira.jboss.org/jira/browse/JBIDE-1755 Added Java doc comments.
Modified: trunk/seam/plugins/org.jboss.tools.seam.core/src/org/jboss/tools/seam/internal/core/el/SeamELCompletionEngine.java
===================================================================
--- trunk/seam/plugins/org.jboss.tools.seam.core/src/org/jboss/tools/seam/internal/core/el/SeamELCompletionEngine.java 2008-02-22 13:56:19 UTC (rev 6536)
+++ trunk/seam/plugins/org.jboss.tools.seam.core/src/org/jboss/tools/seam/internal/core/el/SeamELCompletionEngine.java 2008-02-22 14:01:44 UTC (rev 6537)
@@ -36,7 +36,7 @@
import org.jboss.tools.seam.internal.core.el.ElVarSearcher.Var;
/**
- * Utility class used to find Seam Project content assist proposals
+ * Utility class used to collect info for EL
*
* @author Jeremy
*/
@@ -114,19 +114,33 @@
private boolean isMapOrCollectionOrBundleAmoungTheTokens = false;
private TypeInfoCollector.MemberInfo memberOfResolvedOperand;
+ /**
+ * @return MemberInfo of last segment of EL operand. Null if El is not resolved.
+ */
public TypeInfoCollector.MemberInfo getMemberOfResolvedOperand() {
return memberOfResolvedOperand;
}
+ /**
+ * Sets MemberInfo for last segment of EL operand.
+ * @param lastResolvedMember
+ */
public void setMemberOfResolvedOperand(
TypeInfoCollector.MemberInfo lastResolvedMember) {
this.memberOfResolvedOperand = lastResolvedMember;
}
+ /**
+ * Constructor
+ * @param tokens Tokens of EL
+ */
public SeamELOperandResolveStatus(List<ELOperandToken> tokens) {
this.tokens = tokens;
}
+ /**
+ * @return true if EL contains any not parametrized Collection or ResourceBundle.
+ */
public boolean isMapOrCollectionOrBundleAmoungTheTokens() {
return this.isMapOrCollectionOrBundleAmoungTheTokens;
}
@@ -135,14 +149,23 @@
this.isMapOrCollectionOrBundleAmoungTheTokens = true;
}
+ /**
+ * @return true if EL is resolved.
+ */
public boolean isOK() {
return !getProposals().isEmpty() || isMapOrCollectionOrBundleAmoungTheTokens();
}
+ /**
+ * @return false if El is not resolved.
+ */
public boolean isError() {
return !isOK();
}
+ /**
+ * @return List of resolved tokens of EL. Includes separators "."
+ */
public List<ELOperandToken> getResolvedTokens() {
List<ELOperandToken> resolvedTokens = new ArrayList<ELOperandToken>();
int index = tokens.indexOf(lastResolvedToken); // index == -1 means that no tokens are resolved
@@ -152,6 +175,9 @@
return resolvedTokens;
}
+ /**
+ * @return List of unresolved tokens of EL.
+ */
public List<ELOperandToken> getUnresolvedTokens() {
List<ELOperandToken> unresolvedTokens = new ArrayList<ELOperandToken>();
int index = tokens.indexOf(lastResolvedToken); // index == -1 means that no tokens are resolved
@@ -161,38 +187,68 @@
return unresolvedTokens;
}
+ /**
+ * @return Last resolved token of EL. Can be separator "."
+ */
public ELOperandToken getLastResolvedToken() {
return lastResolvedToken;
}
+ /**
+ * @param lastResolvedToken Last resolved token of EL. Can be separator "."
+ */
public void setLastResolvedToken(ELOperandToken lastResolvedToken) {
this.lastResolvedToken = lastResolvedToken;
}
+ /**
+ * @return Tokens of EL.
+ */
public List<ELOperandToken> getTokens() {
return tokens;
}
+ /**
+ * @param tokens Tokens of EL.
+ */
public void setTokens(List<ELOperandToken> tokens) {
this.tokens = tokens;
}
+ /**
+ * @return Set of proposals for EL.
+ */
public Set<String> getProposals() {
return proposals == null ? new TreeSet<String>() : proposals;
}
+ /**
+ * @param proposals Set of proposals.
+ */
public void setProposals(Set<String> proposals) {
this.proposals = proposals;
}
+ /**
+ * @return List of Seam Context Variables used in EL.
+ */
public List<ISeamContextVariable> getUsedVariables() {
return (usedVariables == null ? new ArrayList<ISeamContextVariable>() : usedVariables);
}
+ /**
+ * @param usedVariables List of Seam Context Variables used in EL.
+ */
public void setUsedVariables(List<ISeamContextVariable> usedVariables) {
this.usedVariables = usedVariables;
}
+ /**
+ * @return Map of unpaired getters and setters (getters/setters without proper setters/getters).
+ * of all properties used in EL.
+ * Key - name of property.
+ * Value - MethodInfo of existed getter/setter.
+ */
public Map<String, TypeInfoCollector.MethodInfo> getUnpairedGettersOrSetters() {
if (unpairedGettersOrSetters == null) {
unpairedGettersOrSetters = new HashMap<String, TypeInfoCollector.MethodInfo>();
@@ -200,6 +256,9 @@
return unpairedGettersOrSetters;
}
+ /**
+ * Clear Map of unpaired getters and setters.
+ */
public void clearUnpairedGettersOrSetters() {
getUnpairedGettersOrSetters().clear();
}
@@ -219,6 +278,20 @@
return proposals;
}
+ /**
+ * Resolve EL.
+ * @param project Seam project.
+ * @param file
+ * @param documentContent
+ * @param prefix Text between #{ and cursor position in document.
+ * @param position Cursor position in document
+ * @param returnEqualedVariablesOnly if "false" use prefix as mask.
+ * @param vars All "var" attributes that can be used in the EL.
+ * @param varSearcher
+ * @return Status of resolving.
+ * @throws BadLocationException
+ * @throws StringIndexOutOfBoundsException
+ */
public SeamELOperandResolveStatus resolveSeamELOperand(ISeamProject project, IFile file, String documentContent, CharSequence prefix,
int position, boolean returnEqualedVariablesOnly, List<Var> vars, ElVarSearcher varSearcher) throws BadLocationException, StringIndexOutOfBoundsException {
String oldEl = prefix.toString();
@@ -286,11 +359,29 @@
return status;
}
+ /**
+ * Returns MemberInfo for last segment of EL. Null if El is not resolved.
+ * @param project
+ * @param file
+ * @param elBody EL without #{}
+ * @return MemberInfo for last segment of EL. Null if El is not resolved.
+ * @throws BadLocationException
+ * @throws StringIndexOutOfBoundsException
+ */
public TypeInfoCollector.MemberInfo resolveSeamEL(ISeamProject project, IFile file, String elBody) throws BadLocationException, StringIndexOutOfBoundsException {
SeamELOperandResolveStatus status = resolveSeamELOperand(project, file, elBody, elBody, 0, true);
return status.getMemberOfResolvedOperand();
}
+ /**
+ * Returns a list of Seam Context Variables that is represented by EL. Null if El is not resolved.
+ * @param project
+ * @param file
+ * @param el
+ * @return
+ * @throws BadLocationException
+ * @throws StringIndexOutOfBoundsException
+ */
public List<ISeamContextVariable> resolveSeamVariableFromEL(ISeamProject project, IFile file, String el) throws BadLocationException, StringIndexOutOfBoundsException {
SeamELOperandTokenizer tokenizer = new SeamELOperandTokenizer(el, el.length());
List<ELOperandToken> tokens = tokenizer.getTokens();
@@ -635,7 +726,6 @@
/*
* Creates and returns list of possible variable name combinations from expression starting from the longest name
- *
*
* @param prefix
* @return
@@ -715,6 +805,13 @@
return documentContent.substring(tokens.get(0).start, offset);
}
+ /**
+ * @param documentContent
+ * @param offset
+ * @param region
+ * @return
+ * @throws StringIndexOutOfBoundsException
+ */
public String getJavaElementExpression(String documentContent, int offset, IRegion region) throws StringIndexOutOfBoundsException {
if (documentContent == null || offset > documentContent.length())
return null;
17 years, 7 months
JBoss Tools SVN: r6536 - trunk/vpe/tests/org.jboss.tools.vpe.ui.test/src/org/jboss/tools/vpe/ui/test.
by jbosstools-commits＠lists.jboss.org
Author: mareshkau
Date: 2008-02-22 08:56:19 -0500 (Fri, 22 Feb 2008)
New Revision: 6536
Modified:
trunk/vpe/tests/org.jboss.tools.vpe.ui.test/src/org/jboss/tools/vpe/ui/test/VpeTest.java
Log:
http://jira.jboss.com/jira/browse/JBIDE-675, junit tests
Modified: trunk/vpe/tests/org.jboss.tools.vpe.ui.test/src/org/jboss/tools/vpe/ui/test/VpeTest.java
===================================================================
--- trunk/vpe/tests/org.jboss.tools.vpe.ui.test/src/org/jboss/tools/vpe/ui/test/VpeTest.java 2008-02-22 13:05:49 UTC (rev 6535)
+++ trunk/vpe/tests/org.jboss.tools.vpe.ui.test/src/org/jboss/tools/vpe/ui/test/VpeTest.java 2008-02-22 13:56:19 UTC (rev 6536)
@@ -157,6 +157,18 @@
return document;
}
+
+ /**
+ * Gets visual page editor controller
+ * @param part
+ * @return {@link VpeController}
+ */
+ protected VpeController getVpeController(JSPMultiPageEditor part) {
+
+ VpeEditorPart visualEditor = (VpeEditorPart) part.getVisualEditor();
+
+ return visualEditor.getController();
+ }
/**
* Perfoms test for some page
17 years, 7 months
JBoss Tools SVN: r6534 - in trunk/jsf/tests/org.jboss.tools.jsf.vpe.jsf.test/src/org/jboss/tools/jsf/vpe/jsf/test: jbide and 1 other directory.
by jbosstools-commits＠lists.jboss.org
Author: mareshkau
Date: 2008-02-22 08:04:33 -0500 (Fri, 22 Feb 2008)
New Revision: 6534
Added:
trunk/jsf/tests/org.jboss.tools.jsf.vpe.jsf.test/src/org/jboss/tools/jsf/vpe/jsf/test/jbide/JBIDE675Test.java
Modified:
trunk/jsf/tests/org.jboss.tools.jsf.vpe.jsf.test/src/org/jboss/tools/jsf/vpe/jsf/test/JsfAllTests.java
Log:
http://jira.jboss.com/jira/browse/JBIDE-675, junit tests
Modified: trunk/jsf/tests/org.jboss.tools.jsf.vpe.jsf.test/src/org/jboss/tools/jsf/vpe/jsf/test/JsfAllTests.java
===================================================================
--- trunk/jsf/tests/org.jboss.tools.jsf.vpe.jsf.test/src/org/jboss/tools/jsf/vpe/jsf/test/JsfAllTests.java 2008-02-22 12:59:32 UTC (rev 6533)
+++ trunk/jsf/tests/org.jboss.tools.jsf.vpe.jsf.test/src/org/jboss/tools/jsf/vpe/jsf/test/JsfAllTests.java 2008-02-22 13:04:33 UTC (rev 6534)
@@ -21,12 +21,12 @@
import org.jboss.tools.jsf.vpe.jsf.test.jbide.JBIDE1484Test;
import org.jboss.tools.jsf.vpe.jsf.test.jbide.JBIDE1615Test;
import org.jboss.tools.jsf.vpe.jsf.test.jbide.JBIDE1744Test;
+import org.jboss.tools.jsf.vpe.jsf.test.jbide.JBIDE675Test;
import org.jboss.tools.jsf.vpe.jsf.test.jbide.JBIDE788Test;
import org.jboss.tools.jsf.vpe.jsf.test.jbide.JsfJbide1467Test;
import org.jboss.tools.jsf.vpe.jsf.test.jbide.JsfJbide1501Test;
import org.jboss.tools.jsf.vpe.jsf.test.jbide.JsfJbide1548Test;
import org.jboss.tools.jsf.vpe.jsf.test.jbide.JsfJbide1568Test;
-import org.jboss.tools.jsf.vpe.jsf.test.perfomance.PerfomanceTest;
import org.jboss.tools.vpe.ui.test.VpeTestSetup;
import org.jboss.tools.vpe.ui.test.beans.ImportBean;
@@ -54,7 +54,7 @@
suite.addTestSuite(JBIDE788Test.class);
suite.addTestSuite(JBIDE1105Test.class);
suite.addTestSuite(JBIDE1744Test.class);
-
+ suite.addTestSuite(JBIDE675Test.class);
// $JUnit-END$
//added by Max Areshkau
//add here projects which should be imported for junit tests
Added: trunk/jsf/tests/org.jboss.tools.jsf.vpe.jsf.test/src/org/jboss/tools/jsf/vpe/jsf/test/jbide/JBIDE675Test.java
===================================================================
--- trunk/jsf/tests/org.jboss.tools.jsf.vpe.jsf.test/src/org/jboss/tools/jsf/vpe/jsf/test/jbide/JBIDE675Test.java (rev 0)
+++ trunk/jsf/tests/org.jboss.tools.jsf.vpe.jsf.test/src/org/jboss/tools/jsf/vpe/jsf/test/jbide/JBIDE675Test.java 2008-02-22 13:04:33 UTC (rev 6534)
@@ -0,0 +1,98 @@
+/*******************************************************************************
+* 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.test.jbide;
+
+import org.eclipse.core.resources.IFile;
+import org.eclipse.swt.custom.StyledText;
+import org.eclipse.ui.IEditorInput;
+import org.eclipse.ui.part.FileEditorInput;
+import org.eclipse.wst.sse.core.internal.provisional.IndexedRegion;
+import org.eclipse.wst.sse.ui.internal.contentassist.ContentAssistUtils;
+import org.jboss.tools.jst.jsp.jspeditor.JSPMultiPageEditor;
+import org.jboss.tools.vpe.editor.VpeController;
+import org.jboss.tools.vpe.editor.mapping.VpeDomMapping;
+import org.jboss.tools.vpe.editor.mapping.VpeNodeMapping;
+import org.jboss.tools.vpe.ui.test.TestUtil;
+import org.jboss.tools.vpe.ui.test.VpeTest;
+import org.mozilla.interfaces.nsIDOMNode;
+import org.w3c.dom.Node;
+
+/**
+ * @author mareshkau
+ *
+ */
+public class JBIDE675Test extends VpeTest{
+
+ private static final String IMPORT_PROJECT_NAME = "jsfTest";
+
+ private static final String TEST_PAGE_NAME = "JBIDE/675/testChangeOnUserInputTextNode.xhtml";
+
+ public JBIDE675Test(String name) {
+ super(name);
+ }
+
+ /**
+ * Tests Base Input on Source Page
+ * @throws Throwable
+ */
+ public void testBaseTextInputOnPage() throws Throwable {
+ // wait
+ TestUtil.waitForJobs();
+ // set exception
+ setException(null);
+ //Tests CA
+ // get test page path
+ IFile file = (IFile) TestUtil.getComponentPath(TEST_PAGE_NAME,
+ IMPORT_PROJECT_NAME);
+ assertNotNull("Could not open specified file " + TEST_PAGE_NAME,
+ file);
+
+ IEditorInput input = new FileEditorInput(file);
+
+ assertNotNull("Editor input is null", input);
+
+ // open and get editor
+ JSPMultiPageEditor part = openEditor(input);
+
+ StyledText styledText = part.getSourceEditor().getTextViewer().getTextWidget();
+
+ for(int i=0;i<20;i++) {
+
+
+ styledText.setCaretOffset(339);
+ IndexedRegion treeNode = ContentAssistUtils.getNodeAt(part.getSourceEditor().getTextViewer(), 339);
+ Node node = (Node) treeNode;
+ assertNotNull(node);
+
+ VpeController vpeController = getVpeController(part);
+
+ VpeDomMapping domMapping = vpeController.getDomMapping();
+
+ VpeNodeMapping nodeMapping = domMapping.getNodeMapping(node);
+
+ assertNotNull(nodeMapping);
+
+ nsIDOMNode span = nodeMapping.getVisualNode();
+
+ nsIDOMNode textNode = span.getFirstChild();
+
+ assertEquals(textNode.getNodeType(), nsIDOMNode.TEXT_NODE);
+
+ assertNotNull(textNode.getNodeValue());
+
+ assertEquals(textNode.getNodeValue().trim(), node.getNodeValue().trim());
+
+ styledText.insert("t");
+ }
+
+ TestUtil.delay(5000L);
+ }
+}
17 years, 7 months