JBoss Tools SVN: r19155 - in trunk/jsf/plugins/org.jboss.tools.jsf.vpe.seam/src/org/jboss/tools/jsf/vpe/seam/template: util and 1 other directory.
by jbosstools-commits＠lists.jboss.org
Author: yzhishko
Date: 2009-12-09 08:56:08 -0500 (Wed, 09 Dec 2009)
New Revision: 19155
Added:
trunk/jsf/plugins/org.jboss.tools.jsf.vpe.seam/src/org/jboss/tools/jsf/vpe/seam/template/SeamPdfAbstractChapterTemplate.java
Modified:
trunk/jsf/plugins/org.jboss.tools.jsf.vpe.seam/src/org/jboss/tools/jsf/vpe/seam/template/SeamPdfChapterTemplate.java
trunk/jsf/plugins/org.jboss.tools.jsf.vpe.seam/src/org/jboss/tools/jsf/vpe/seam/template/SeamPdfDocumentTemplate.java
trunk/jsf/plugins/org.jboss.tools.jsf.vpe.seam/src/org/jboss/tools/jsf/vpe/seam/template/SeamPdfFooterTemplate.java
trunk/jsf/plugins/org.jboss.tools.jsf.vpe.seam/src/org/jboss/tools/jsf/vpe/seam/template/SeamPdfSectionTemplate.java
trunk/jsf/plugins/org.jboss.tools.jsf.vpe.seam/src/org/jboss/tools/jsf/vpe/seam/template/SeamPdfTableTemplate.java
trunk/jsf/plugins/org.jboss.tools.jsf.vpe.seam/src/org/jboss/tools/jsf/vpe/seam/template/SeamPdfTitleTemplate.java
trunk/jsf/plugins/org.jboss.tools.jsf.vpe.seam/src/org/jboss/tools/jsf/vpe/seam/template/util/SeamUtil.java
Log:
https://jira.jboss.org/jira/browse/JBIDE-5415 fixed
Added: trunk/jsf/plugins/org.jboss.tools.jsf.vpe.seam/src/org/jboss/tools/jsf/vpe/seam/template/SeamPdfAbstractChapterTemplate.java
===================================================================
--- trunk/jsf/plugins/org.jboss.tools.jsf.vpe.seam/src/org/jboss/tools/jsf/vpe/seam/template/SeamPdfAbstractChapterTemplate.java (rev 0)
+++ trunk/jsf/plugins/org.jboss.tools.jsf.vpe.seam/src/org/jboss/tools/jsf/vpe/seam/template/SeamPdfAbstractChapterTemplate.java 2009-12-09 13:56:08 UTC (rev 19155)
@@ -0,0 +1,74 @@
+/*******************************************************************************
+ * Copyright (c) 2007-2009 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.seam.template;
+
+/**
+ * @author yzhishko
+ */
+
+import org.jboss.tools.jsf.vpe.seam.template.util.SeamUtil;
+import org.jboss.tools.vpe.editor.context.VpePageContext;
+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.mozilla.interfaces.nsIDOMNode;
+import org.mozilla.interfaces.nsIDOMNodeList;
+import org.w3c.dom.Element;
+import org.w3c.dom.Node;
+
+public abstract class SeamPdfAbstractChapterTemplate extends
+ SeamPdfAbstractTemplate {
+
+ @Override
+ public void validate(VpePageContext pageContext, Node sourceNode,
+ nsIDOMDocument visualDocument, VpeCreationData data) {
+ setTitle(pageContext, (Element) sourceNode, data);
+ }
+
+ private void setTitle(VpePageContext pageContext, Element sourceElement,
+ VpeCreationData data) {
+ nsIDOMNode visualTitleNode = getTitleForVisualNode(data.getNode());
+ if (visualTitleNode != null) {
+ nsIDOMElement headElement = getHeadElement(data);
+ nsIDOMNode parentNode = visualTitleNode.getParentNode();
+ if (parentNode != null) {
+ parentNode.removeChild(visualTitleNode);
+ headElement.appendChild(visualTitleNode);
+ }
+ }
+ }
+
+ private nsIDOMNode getTitleForVisualNode(nsIDOMNode visualNode) {
+ if (visualNode == null) {
+ return null;
+ }
+ nsIDOMNodeList children = visualNode.getChildNodes();
+ for (int i = 0; i < children.getLength(); i++) {
+ nsIDOMNode child = children.item(i);
+ if (HTML.TAG_SPAN.equalsIgnoreCase(child.getNodeName())) {
+ nsIDOMElement childElement = (nsIDOMElement) child
+ .queryInterface(nsIDOMElement.NS_IDOMELEMENT_IID);
+ String attrType = childElement
+ .getAttribute(SeamUtil.SEAM_ATTR_TYPE_ID);
+ if (attrType != null
+ && SeamUtil.SEAM_ATTR_TYPE_ID_VALUE_PDF_TITLE
+ .equalsIgnoreCase(attrType)) {
+ return child;
+ }
+ }
+ }
+ return null;
+ }
+
+ protected abstract nsIDOMElement getHeadElement(VpeCreationData data);
+
+}
Modified: trunk/jsf/plugins/org.jboss.tools.jsf.vpe.seam/src/org/jboss/tools/jsf/vpe/seam/template/SeamPdfChapterTemplate.java
===================================================================
--- trunk/jsf/plugins/org.jboss.tools.jsf.vpe.seam/src/org/jboss/tools/jsf/vpe/seam/template/SeamPdfChapterTemplate.java 2009-12-09 13:55:11 UTC (rev 19154)
+++ trunk/jsf/plugins/org.jboss.tools.jsf.vpe.seam/src/org/jboss/tools/jsf/vpe/seam/template/SeamPdfChapterTemplate.java 2009-12-09 13:56:08 UTC (rev 19155)
@@ -25,16 +25,14 @@
import org.mozilla.interfaces.nsIDOMText;
import org.w3c.dom.Element;
import org.w3c.dom.Node;
-import org.w3c.dom.NodeList;
-public class SeamPdfChapterTemplate extends SeamPdfAbstractTemplate {
+public class SeamPdfChapterTemplate extends SeamPdfAbstractChapterTemplate {
private static final String NUMBER = "number"; //$NON-NLS-1$
private nsIDOMElement visualElement;
private Element sourceElement;
-
public VpeCreationData create(VpePageContext pageContext, Node sourceNode,
nsIDOMDocument visualDocument) {
sourceElement = (Element) sourceNode;
@@ -57,33 +55,8 @@
return new VpeCreationData(visualElement);
}
- private void setTitle(VpePageContext pageContext, Element sourceElement,
- VpeCreationData data) {
- Node sourceTitleNode = null;
- NodeList children = sourceElement.getChildNodes();
- for (int i = 0; i < children.getLength(); i++) {
- if (children.item(i) instanceof Element) {
- if (children.item(i).getNodeName().endsWith("title")) { //$NON-NLS-1$
- sourceTitleNode = children.item(i);
- }
- }
- }
- nsIDOMNode visualTitleNode = null;
- if (sourceTitleNode != null) {
- visualTitleNode = pageContext.getDomMapping().getVisualNode(
- sourceTitleNode);
- }
- if (visualTitleNode != null) {
- nsIDOMElement headElement = getHeadElement(data);
- nsIDOMNode parentNode = visualTitleNode.getParentNode();
- if (parentNode != null) {
- parentNode.removeChild(visualTitleNode);
- headElement.appendChild(visualTitleNode);
- }
- }
- }
-
- private nsIDOMElement getHeadElement(VpeCreationData data) {
+ @Override
+ protected nsIDOMElement getHeadElement(VpeCreationData data) {
nsIDOMNode visualNode = data.getNode();
nsIDOMNodeList children = visualNode.getChildNodes();
for (int i = 0; i < children.getLength(); i++) {
@@ -98,10 +71,4 @@
return null;
}
- @Override
- public void validate(VpePageContext pageContext, Node sourceNode,
- nsIDOMDocument visualDocument, VpeCreationData data) {
- setTitle(pageContext, (Element) sourceNode, data);
- }
-
}
Modified: trunk/jsf/plugins/org.jboss.tools.jsf.vpe.seam/src/org/jboss/tools/jsf/vpe/seam/template/SeamPdfDocumentTemplate.java
===================================================================
--- trunk/jsf/plugins/org.jboss.tools.jsf.vpe.seam/src/org/jboss/tools/jsf/vpe/seam/template/SeamPdfDocumentTemplate.java 2009-12-09 13:55:11 UTC (rev 19154)
+++ trunk/jsf/plugins/org.jboss.tools.jsf.vpe.seam/src/org/jboss/tools/jsf/vpe/seam/template/SeamPdfDocumentTemplate.java 2009-12-09 13:56:08 UTC (rev 19155)
@@ -14,6 +14,9 @@
* @author yzhishko
*/
+import java.util.ArrayList;
+import java.util.List;
+
import org.jboss.tools.jsf.vpe.seam.template.util.SeamUtil;
import org.jboss.tools.vpe.editor.context.VpePageContext;
import org.jboss.tools.vpe.editor.template.VpeCreationData;
@@ -21,6 +24,7 @@
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;
@@ -29,7 +33,6 @@
private nsIDOMElement headElement;
private Element sourceElement;
-
public VpeCreationData create(VpePageContext pageContext, Node sourceNode,
nsIDOMDocument visualDocument) {
nsIDOMNode headNode = visualDocument.createElement(HTML.TAG_DIV);
@@ -45,7 +48,7 @@
return false;
}
headElement.removeAttribute("style"); //$NON-NLS-1$
- headElement.setAttribute("style", "margin-left:" //$NON-NLS-1$//$NON-NLS-2$
+ headElement.setAttribute("style", "margin-left:" //$NON-NLS-1$//$NON-NLS-2$
+ Float.toString(marginValues[0]) + ";margin-right:" //$NON-NLS-1$
+ Float.toString(marginValues[1]) + ";margin-top:" //$NON-NLS-1$
+ Float.toString(marginValues[2]) + ";margin-bottom:" //$NON-NLS-1$
@@ -92,21 +95,20 @@
private void setFooter(VpePageContext pageContext, Node sourceNode,
VpeCreationData data) {
- Node[] footers = SeamUtil.getChildsByName(pageContext, sourceNode,
- "p:footer"); //$NON-NLS-1$
- nsIDOMNode visualFooter = null;
- if (footers != null && footers.length != 0) {
- visualFooter = pageContext.getDomMapping().getVisualNode(
- footers[footers.length - 1]);
-
+ nsIDOMNode[] footers = findFootersForVisualDoc((nsIDOMElement) data
+ .getNode().queryInterface(nsIDOMElement.NS_IDOMELEMENT_IID));
+ int footersLength = footers.length;
+ if (footersLength == 0) {
+ return;
}
+ nsIDOMNode visualFooter = footers[footersLength-1];
if (visualFooter != null) {
for (int i = 0; i < footers.length; i++) {
- nsIDOMNode visualFootersRepresent = pageContext.getDomMapping()
- .getVisualNode(footers[i]);
+ nsIDOMNode visualFootersRepresent = footers[i];
if (visualFootersRepresent != null
&& visualFootersRepresent != visualFooter) {
- nsIDOMNode parentNode = visualFootersRepresent.getParentNode();
+ nsIDOMNode parentNode = visualFootersRepresent
+ .getParentNode();
parentNode.removeChild(visualFootersRepresent);
}
}
@@ -117,4 +119,23 @@
}
}
}
+
+ private nsIDOMNode[] findFootersForVisualDoc(nsIDOMElement visualElement) {
+ nsIDOMNodeList children = visualElement
+ .getElementsByTagName(HTML.TAG_DIV);
+ List<nsIDOMElement> childrenElements = new ArrayList<nsIDOMElement>();
+ for (int i = 0; i < children.getLength(); i++) {
+ nsIDOMElement childElement = (nsIDOMElement) children.item(i)
+ .queryInterface(nsIDOMElement.NS_IDOMELEMENT_IID);
+ String attrType = childElement
+ .getAttribute(SeamUtil.SEAM_ATTR_TYPE_ID);
+ if (attrType != null
+ && SeamUtil.SEAM_ATTR_TYPE_ID_VALUE_PDF_FOOTER
+ .equalsIgnoreCase(attrType)) {
+ childrenElements.add(childElement);
+ }
+ }
+ return childrenElements.toArray(new nsIDOMElement[0]);
+ }
+
}
Modified: trunk/jsf/plugins/org.jboss.tools.jsf.vpe.seam/src/org/jboss/tools/jsf/vpe/seam/template/SeamPdfFooterTemplate.java
===================================================================
--- trunk/jsf/plugins/org.jboss.tools.jsf.vpe.seam/src/org/jboss/tools/jsf/vpe/seam/template/SeamPdfFooterTemplate.java 2009-12-09 13:55:11 UTC (rev 19154)
+++ trunk/jsf/plugins/org.jboss.tools.jsf.vpe.seam/src/org/jboss/tools/jsf/vpe/seam/template/SeamPdfFooterTemplate.java 2009-12-09 13:56:08 UTC (rev 19155)
@@ -29,7 +29,6 @@
private nsIDOMElement visualElement;
private Element sourceElement;
-
public VpeCreationData create(VpePageContext pageContext, Node sourceNode,
nsIDOMDocument visualDocument) {
sourceElement = (Element) sourceNode;
@@ -43,6 +42,8 @@
if (styleAttr != null && !"".equals(styleAttr)) { //$NON-NLS-1$
visualElement.setAttribute(HTML.ATTR_STYLE, styleAttr);
}
+ visualElement.setAttribute(SeamUtil.SEAM_ATTR_TYPE_ID,
+ SeamUtil.SEAM_ATTR_TYPE_ID_VALUE_PDF_FOOTER);
return new VpeCreationData(visualElement);
}
Modified: trunk/jsf/plugins/org.jboss.tools.jsf.vpe.seam/src/org/jboss/tools/jsf/vpe/seam/template/SeamPdfSectionTemplate.java
===================================================================
--- trunk/jsf/plugins/org.jboss.tools.jsf.vpe.seam/src/org/jboss/tools/jsf/vpe/seam/template/SeamPdfSectionTemplate.java 2009-12-09 13:55:11 UTC (rev 19154)
+++ trunk/jsf/plugins/org.jboss.tools.jsf.vpe.seam/src/org/jboss/tools/jsf/vpe/seam/template/SeamPdfSectionTemplate.java 2009-12-09 13:56:08 UTC (rev 19155)
@@ -30,14 +30,13 @@
import org.w3c.dom.Node;
import org.w3c.dom.NodeList;
-public class SeamPdfSectionTemplate extends SeamPdfAbstractTemplate {
+public class SeamPdfSectionTemplate extends SeamPdfAbstractChapterTemplate {
private nsIDOMElement visualElement;
private Element sourceElement;
private String sectionNumberString;
private String headNameString;
-
public VpeCreationData create(VpePageContext pageContext, Node sourceNode,
nsIDOMDocument visualDocument) {
visualElement = VisualDomUtil.createBorderlessContainer(visualDocument);
@@ -135,33 +134,8 @@
return chapterNumber;
}
- private void setTitle(VpePageContext pageContext, Element sourceElement,
- VpeCreationData data) {
- Node sourceTitleNode = null;
- NodeList children = sourceElement.getChildNodes();
- for (int i = 0; i < children.getLength(); i++) {
- if (children.item(i) instanceof Element) {
- if (children.item(i).getNodeName().endsWith("title")) { //$NON-NLS-1$
- sourceTitleNode = children.item(i);
- }
- }
- }
- nsIDOMNode visualTitleNode = null;
- if (sourceTitleNode != null) {
- visualTitleNode = pageContext.getDomMapping().getVisualNode(
- sourceTitleNode);
- }
- if (visualTitleNode != null) {
- nsIDOMElement headElement = getHeadElement(data);
- nsIDOMNode parentNode = visualTitleNode.getParentNode();
- if (parentNode != null) {
- parentNode.removeChild(visualTitleNode);
- headElement.appendChild(visualTitleNode);
- }
- }
- }
-
- private nsIDOMElement getHeadElement(VpeCreationData data) {
+ @Override
+ protected nsIDOMElement getHeadElement(VpeCreationData data) {
nsIDOMNode visualNode = data.getNode();
nsIDOMNodeList children = visualNode.getChildNodes();
for (int i = 0; i < children.getLength(); i++) {
@@ -181,10 +155,4 @@
return null;
}
- @Override
- public void validate(VpePageContext pageContext, Node sourceNode,
- nsIDOMDocument visualDocument, VpeCreationData data) {
- setTitle(pageContext, (Element) sourceNode, data);
- }
-
}
Modified: trunk/jsf/plugins/org.jboss.tools.jsf.vpe.seam/src/org/jboss/tools/jsf/vpe/seam/template/SeamPdfTableTemplate.java
===================================================================
--- trunk/jsf/plugins/org.jboss.tools.jsf.vpe.seam/src/org/jboss/tools/jsf/vpe/seam/template/SeamPdfTableTemplate.java 2009-12-09 13:55:11 UTC (rev 19154)
+++ trunk/jsf/plugins/org.jboss.tools.jsf.vpe.seam/src/org/jboss/tools/jsf/vpe/seam/template/SeamPdfTableTemplate.java 2009-12-09 13:56:08 UTC (rev 19155)
@@ -14,6 +14,7 @@
* @author yzhishko
*/
+import java.util.ArrayList;
import java.util.List;
import org.jboss.tools.jsf.vpe.seam.template.util.SeamUtil;
@@ -24,6 +25,7 @@
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;
@@ -90,35 +92,22 @@
private void setColumns(VpePageContext pageContext, Node sourceNode,
nsIDOMDocument visualDocument, VpeCreationData data) {
int numberOfColumns = getNumberOfColumns(sourceNode);
- List<VpeChildrenInfo> cellsList = data.getChildrenInfoList();
- if (cellsList == null) {
+ nsIDOMNode visualTable = ((nsIDOMElement) data.getNode()
+ .queryInterface(nsIDOMElement.NS_IDOMELEMENT_IID))
+ .getElementsByTagName(HTML.TAG_TABLE).item(0);
+ nsIDOMNode[] visualCells = getCells(data.getNode());
+ if (visualCells == null) {
return;
}
- VpeChildrenInfo childrenInfo = cellsList.get(0);
- List<Node> children = childrenInfo.getSourceChildren();
- if (children == null) {
+ int cellsLength = visualCells.length;
+ if (cellsLength == 0) {
return;
}
- Node[] cells = children.toArray(new Element[0]);
- int cellsLength = cells.length;
- if (numberOfColumns > cellsLength) {
- for (int i = 0; i < cells.length; i++) {
- nsIDOMNode visualCell = pageContext.getDomMapping()
- .getVisualNode(cells[i]);
- nsIDOMNode parentNode = visualCell.getParentNode();
- parentNode.removeChild(visualCell);
- }
- return;
- }
- nsIDOMNode visualTable = ((nsIDOMElement) data.getNode()
- .queryInterface(nsIDOMElement.NS_IDOMELEMENT_IID))
- .getElementsByTagName(HTML.TAG_TABLE).item(0);
nsIDOMNode trVisualNode = visualDocument.createElement(HTML.TAG_TR);
visualTable.appendChild(trVisualNode);
int posCounter = 0;
for (int i = 0; i < cellsLength; i++) {
- nsIDOMNode visualCell = pageContext.getDomMapping().getVisualNode(
- cells[i]);
+ nsIDOMNode visualCell = visualCells[i];
nsIDOMNode parentNode = null;
if (visualCell != null) {
parentNode = visualCell.getParentNode();
@@ -141,8 +130,7 @@
} else {
for (int j = 0; j < numberOfColumns - (colspanValue); j++) {
i++;
- visualCell = pageContext.getDomMapping()
- .getVisualNode(cells[i]);
+ visualCell = visualCells[i];
trVisualNode.appendChild(visualCell);
}
i -= numberOfColumns - (colspanValue);
@@ -216,4 +204,22 @@
return colspan;
}
+ private nsIDOMNode[] getCells(nsIDOMNode visualTable) {
+ nsIDOMNodeList children = visualTable.getChildNodes();
+ if (children == null) {
+ return null;
+ }
+ List<nsIDOMElement> childrenList = new ArrayList<nsIDOMElement>();
+ for (int i = 0; i < children.getLength(); i++) {
+ nsIDOMNode child = children.item(i);
+ if (child.getNodeType() == nsIDOMNode.ELEMENT_NODE) {
+ if ("TD".equals(child.getNodeName())) { //$NON-NLS-1$
+ childrenList.add((nsIDOMElement) child
+ .queryInterface(nsIDOMElement.NS_IDOMELEMENT_IID));
+ }
+ }
+ }
+ return childrenList.toArray(new nsIDOMElement[0]);
+ }
+
}
Modified: trunk/jsf/plugins/org.jboss.tools.jsf.vpe.seam/src/org/jboss/tools/jsf/vpe/seam/template/SeamPdfTitleTemplate.java
===================================================================
--- trunk/jsf/plugins/org.jboss.tools.jsf.vpe.seam/src/org/jboss/tools/jsf/vpe/seam/template/SeamPdfTitleTemplate.java 2009-12-09 13:55:11 UTC (rev 19154)
+++ trunk/jsf/plugins/org.jboss.tools.jsf.vpe.seam/src/org/jboss/tools/jsf/vpe/seam/template/SeamPdfTitleTemplate.java 2009-12-09 13:56:08 UTC (rev 19155)
@@ -10,20 +10,23 @@
******************************************************************************/
package org.jboss.tools.jsf.vpe.seam.template;
+import org.jboss.tools.jsf.vpe.seam.template.util.SeamUtil;
import org.jboss.tools.vpe.editor.context.VpePageContext;
import org.jboss.tools.vpe.editor.template.VpeCreationData;
import org.jboss.tools.vpe.editor.util.VisualDomUtil;
import org.mozilla.interfaces.nsIDOMDocument;
-import org.mozilla.interfaces.nsIDOMNode;
+import org.mozilla.interfaces.nsIDOMElement;
import org.w3c.dom.Node;
public class SeamPdfTitleTemplate extends SeamPdfAbstractTemplate {
-
public VpeCreationData create(VpePageContext pageContext, Node sourceNode,
nsIDOMDocument visualDocument) {
- nsIDOMNode visualNode = VisualDomUtil.createBorderlessContainer(visualDocument);
- return new VpeCreationData(visualNode);
+ nsIDOMElement visualElement = VisualDomUtil
+ .createBorderlessContainer(visualDocument);
+ visualElement.setAttribute(SeamUtil.SEAM_ATTR_TYPE_ID,
+ SeamUtil.SEAM_ATTR_TYPE_ID_VALUE_PDF_TITLE);
+ return new VpeCreationData(visualElement);
}
}
Modified: trunk/jsf/plugins/org.jboss.tools.jsf.vpe.seam/src/org/jboss/tools/jsf/vpe/seam/template/util/SeamUtil.java
===================================================================
--- trunk/jsf/plugins/org.jboss.tools.jsf.vpe.seam/src/org/jboss/tools/jsf/vpe/seam/template/util/SeamUtil.java 2009-12-09 13:55:11 UTC (rev 19154)
+++ trunk/jsf/plugins/org.jboss.tools.jsf.vpe.seam/src/org/jboss/tools/jsf/vpe/seam/template/util/SeamUtil.java 2009-12-09 13:56:08 UTC (rev 19155)
@@ -40,13 +40,16 @@
public static final String ATTR_URL = "url"; //$NON-NLS-1$
public final static String SEAM_ATTR_MARGINS = "margins"; //$NON-NLS-1$
public final static String[] POSSIBLE_ALIGNS = new String[] { "left", //$NON-NLS-1$
- "right", "center", "justify", "justifyall" }; //$NON-NLS-1$//$NON-NLS-2$ //$NON-NLS-3$//$NON-NLS-4$
+ "right", "center", "justify", "justifyall" }; //$NON-NLS-1$//$NON-NLS-2$ //$NON-NLS-3$//$NON-NLS-4$
public final static String SEAM_ATTR_ALIGNMENT = "alignment"; //$NON-NLS-1$
public final static String SEAM_DIV_BASIC_STYLE_VALUE = "line-height: 142.0pt; font-family: unknown;"; //$NON-NLS-1$
public final static String SEAM_SPAN_BASIC_STYLE_VALUE = "font-family: unknown;"; //$NON-NLS-1$
public final static String SEAM_ATTR_HORIZONAL_ALIGNMENT = "horizontalAlignment"; //$NON-NLS-1$
public final static String SEAM_ATTR_VERTICAL_ALIGNMENT = "verticalAlignment"; //$NON-NLS-1$
public final static String SEAM_ATTR_WIDTH_PERCENTAGE = "widthPercentage"; //$NON-NLS-1$
+ public final static String SEAM_ATTR_TYPE_ID_VALUE_PDF_TITLE = "pdf-title"; //$NON-NLS-1$
+ public final static String SEAM_ATTR_TYPE_ID = "TYPEID"; //$NON-NLS-1$
+ public final static String SEAM_ATTR_TYPE_ID_VALUE_PDF_FOOTER = "pdf-footer"; //$NON-NLS-1$
public static Node getParentByName(VpePageContext pageContext,
Node sourceNode, String parentName) {
@@ -55,8 +58,8 @@
while (parentNode != null) {
String parentSourcePrefix = parentNode.getPrefix();
- if(parentSourcePrefix==null) {
- parentSourcePrefix=""; //$NON-NLS-1$
+ if (parentSourcePrefix == null) {
+ parentSourcePrefix = ""; //$NON-NLS-1$
}
List<TaglibData> taglibs = XmlUtil.getTaglibsForNode(parentNode,
pageContext);
@@ -110,8 +113,8 @@
for (int i = 0; i < children.getLength(); i++) {
Node childNode = children.item(i);
String childSourcePrefix = childNode.getPrefix();
- if(childSourcePrefix==null) {
- childSourcePrefix=""; //$NON-NLS-1$
+ if (childSourcePrefix == null) {
+ childSourcePrefix = ""; //$NON-NLS-1$
}
List<TaglibData> taglibs = XmlUtil.getTaglibsForNode(childNode,
pageContext);
@@ -208,22 +211,22 @@
}
return " font-size : " + stringSizeAttr + "pt;"; //$NON-NLS-1$ //$NON-NLS-2$
}
-
- public static String getAbsoluteResourcePath(String resourcePathInPlugin) {
- String pluginPath = SeamTemplatesActivator.getPluginResourcePath();
- IPath pluginFile = new Path(pluginPath);
- File file = pluginFile.append(resourcePathInPlugin).toFile();
- if (file.exists()) {
- return file.getAbsolutePath();
- } else {
- throw new IllegalArgumentException("Can't get path for " //$NON-NLS-1$
- + resourcePathInPlugin);
- }
- }
-
- public static void setImg(nsIDOMElement img, String fileImageName) {
- img.setAttribute(HTML.ATTR_SRC, "file://" //$NON-NLS-1$
- + getAbsoluteResourcePath(fileImageName).replace('\\', '/'));
- }
-
+
+ public static String getAbsoluteResourcePath(String resourcePathInPlugin) {
+ String pluginPath = SeamTemplatesActivator.getPluginResourcePath();
+ IPath pluginFile = new Path(pluginPath);
+ File file = pluginFile.append(resourcePathInPlugin).toFile();
+ if (file.exists()) {
+ return file.getAbsolutePath();
+ } else {
+ throw new IllegalArgumentException("Can't get path for " //$NON-NLS-1$
+ + resourcePathInPlugin);
+ }
+ }
+
+ public static void setImg(nsIDOMElement img, String fileImageName) {
+ img.setAttribute(HTML.ATTR_SRC, "file://" //$NON-NLS-1$
+ + getAbsoluteResourcePath(fileImageName).replace('\\', '/'));
+ }
+
}
15 years, 1 month
JBoss Tools SVN: r19154 - trunk/jsf/docs/userguide/en/images/editors_features.
by jbosstools-commits＠lists.jboss.org
Author: smukhina
Date: 2009-12-09 08:55:11 -0500 (Wed, 09 Dec 2009)
New Revision: 19154
Added:
trunk/jsf/docs/userguide/en/images/editors_features/editors_features_openon_el.png
Log:
https://jira.jboss.org/jira/browse/JBDS-948 Open On
Added: trunk/jsf/docs/userguide/en/images/editors_features/editors_features_openon_el.png
===================================================================
(Binary files differ)
Property changes on: trunk/jsf/docs/userguide/en/images/editors_features/editors_features_openon_el.png
___________________________________________________________________
Name: svn:mime-type
+ application/octet-stream
15 years, 1 month
JBoss Tools SVN: r19153 - trunk/common/tests/org.jboss.tools.common.el.core.test/src/org/jboss/tools/common/el/core/test/refactoring.
by jbosstools-commits＠lists.jboss.org
Author: dazarov
Date: 2009-12-09 08:07:54 -0500 (Wed, 09 Dec 2009)
New Revision: 19153
Modified:
trunk/common/tests/org.jboss.tools.common.el.core.test/src/org/jboss/tools/common/el/core/test/refactoring/ELReferencesRenameTest.java
Log:
https://jira.jboss.org/jira/browse/JBIDE-5232
Modified: trunk/common/tests/org.jboss.tools.common.el.core.test/src/org/jboss/tools/common/el/core/test/refactoring/ELReferencesRenameTest.java
===================================================================
--- trunk/common/tests/org.jboss.tools.common.el.core.test/src/org/jboss/tools/common/el/core/test/refactoring/ELReferencesRenameTest.java 2009-12-09 12:54:01 UTC (rev 19152)
+++ trunk/common/tests/org.jboss.tools.common.el.core.test/src/org/jboss/tools/common/el/core/test/refactoring/ELReferencesRenameTest.java 2009-12-09 13:07:54 UTC (rev 19153)
@@ -50,12 +50,12 @@
TestChangeStructure structure = new TestChangeStructure(jsfProject, "/WebContent/pages/hello.jsp");
- TestTextChange change = new TestTextChange(349, 4, "user");
+ TestTextChange change = new TestTextChange(348, 4, "user");
structure.addTextChange(change);
list.add(structure);
structure = new TestChangeStructure(jsfProject, "/WebContent/pages/inputUserName.jsp");
- change = new TestTextChange(495, 4, "user");
+ change = new TestTextChange(494, 4, "user");
structure.addTextChange(change);
list.add(structure);
15 years, 1 month
JBoss Tools SVN: r19152 - trunk/jsf/tests/org.jboss.tools.jsf.vpe.jsf.test/src/org/jboss/tools/jsf/vpe/jsf/test/jbide.
by jbosstools-commits＠lists.jboss.org
Author: scabanovich
Date: 2009-12-09 07:54:01 -0500 (Wed, 09 Dec 2009)
New Revision: 19152
Modified:
trunk/jsf/tests/org.jboss.tools.jsf.vpe.jsf.test/src/org/jboss/tools/jsf/vpe/jsf/test/jbide/JBIDE4509Test.java
Log:
Test out removed.
Modified: trunk/jsf/tests/org.jboss.tools.jsf.vpe.jsf.test/src/org/jboss/tools/jsf/vpe/jsf/test/jbide/JBIDE4509Test.java
===================================================================
--- trunk/jsf/tests/org.jboss.tools.jsf.vpe.jsf.test/src/org/jboss/tools/jsf/vpe/jsf/test/jbide/JBIDE4509Test.java 2009-12-09 12:50:15 UTC (rev 19151)
+++ trunk/jsf/tests/org.jboss.tools.jsf.vpe.jsf.test/src/org/jboss/tools/jsf/vpe/jsf/test/jbide/JBIDE4509Test.java 2009-12-09 12:54:01 UTC (rev 19152)
@@ -117,10 +117,6 @@
public void testJBIDE5099OpenOn() throws Throwable{
IProject project = ResourcesPlugin.getWorkspace().getRoot().getProject(JsfAllTests.IMPORT_JSF_20_PROJECT_NAME);
project.build(IncrementalProjectBuilder.FULL_BUILD, new NullProgressMonitor());
- IResource r = project.findMember("WebContent");
- System.out.println(r);
- r = project.findMember("WebContent/pages");
- System.out.println(r);
IFile file = (IFile) project.findMember("WebContent/pages/JBIDE/5015/login.xhtml"); //$NON-NLS-1$
IEditorInput editorInput = new FileEditorInput(file);
JBIDE4509Test.checkOpenOnInEditor(editorInput, getEditorId(file.getName()), 15, 17, "loginPanel.xhtml"); //$NON-NLS-1$
@@ -130,10 +126,6 @@
public void testJBIDE5099JarOpenOn() throws Throwable{
IProject project = ResourcesPlugin.getWorkspace().getRoot().getProject(JsfAllTests.IMPORT_JSF_20_PROJECT_NAME);
project.build(IncrementalProjectBuilder.FULL_BUILD, new NullProgressMonitor());
- IResource r = project.findMember("WebContent");
- System.out.println(r);
- r = project.findMember("WebContent/pages");
- System.out.println(r);
IFile file = (IFile) project.findMember("WebContent/pages/JBIDE/5015/login.xhtml"); //$NON-NLS-1$
IEditorInput editorInput = new FileEditorInput(file);
JBIDE4509Test.checkOpenOnInEditor(editorInput, getEditorId(file.getName()), 14, 16, "echo.xhtml"); //$NON-NLS-1$
15 years, 1 month
JBoss Tools SVN: r19151 - trunk/jsf/tests/org.jboss.tools.jsf.vpe.jsf.test/src/org/jboss/tools/jsf/vpe/jsf/test/jbide.
by jbosstools-commits＠lists.jboss.org
Author: scabanovich
Date: 2009-12-09 07:50:15 -0500 (Wed, 09 Dec 2009)
New Revision: 19151
Modified:
trunk/jsf/tests/org.jboss.tools.jsf.vpe.jsf.test/src/org/jboss/tools/jsf/vpe/jsf/test/jbide/JBIDE4509Test.java
Log:
https://jira.jboss.org/jira/browse/JBIDE-5099
Modified: trunk/jsf/tests/org.jboss.tools.jsf.vpe.jsf.test/src/org/jboss/tools/jsf/vpe/jsf/test/jbide/JBIDE4509Test.java
===================================================================
--- trunk/jsf/tests/org.jboss.tools.jsf.vpe.jsf.test/src/org/jboss/tools/jsf/vpe/jsf/test/jbide/JBIDE4509Test.java 2009-12-09 11:53:43 UTC (rev 19150)
+++ trunk/jsf/tests/org.jboss.tools.jsf.vpe.jsf.test/src/org/jboss/tools/jsf/vpe/jsf/test/jbide/JBIDE4509Test.java 2009-12-09 12:50:15 UTC (rev 19151)
@@ -14,7 +14,10 @@
import org.eclipse.core.resources.IFile;
import org.eclipse.core.resources.IProject;
+import org.eclipse.core.resources.IResource;
+import org.eclipse.core.resources.IncrementalProjectBuilder;
import org.eclipse.core.resources.ResourcesPlugin;
+import org.eclipse.core.runtime.NullProgressMonitor;
import org.eclipse.jdt.core.IJavaProject;
import org.eclipse.jdt.core.IPackageFragmentRoot;
import org.eclipse.jdt.core.JavaCore;
@@ -109,6 +112,32 @@
JBIDE4509Test.checkOpenOnInEditor(activeEditor.getEditorInput(),getEditorId(activeEditor.getEditorInput().getName()),
8,23,"echo.xhtml"); //$NON-NLS-1$
}
+
+ //test for https://jira.jboss.org/jira/browse/JBIDE-5099
+ public void testJBIDE5099OpenOn() throws Throwable{
+ IProject project = ResourcesPlugin.getWorkspace().getRoot().getProject(JsfAllTests.IMPORT_JSF_20_PROJECT_NAME);
+ project.build(IncrementalProjectBuilder.FULL_BUILD, new NullProgressMonitor());
+ IResource r = project.findMember("WebContent");
+ System.out.println(r);
+ r = project.findMember("WebContent/pages");
+ System.out.println(r);
+ IFile file = (IFile) project.findMember("WebContent/pages/JBIDE/5015/login.xhtml"); //$NON-NLS-1$
+ IEditorInput editorInput = new FileEditorInput(file);
+ JBIDE4509Test.checkOpenOnInEditor(editorInput, getEditorId(file.getName()), 15, 17, "loginPanel.xhtml"); //$NON-NLS-1$
+ }
+
+ //test for https://jira.jboss.org/jira/browse/JBIDE-5099
+ public void testJBIDE5099JarOpenOn() throws Throwable{
+ IProject project = ResourcesPlugin.getWorkspace().getRoot().getProject(JsfAllTests.IMPORT_JSF_20_PROJECT_NAME);
+ project.build(IncrementalProjectBuilder.FULL_BUILD, new NullProgressMonitor());
+ IResource r = project.findMember("WebContent");
+ System.out.println(r);
+ r = project.findMember("WebContent/pages");
+ System.out.println(r);
+ IFile file = (IFile) project.findMember("WebContent/pages/JBIDE/5015/login.xhtml"); //$NON-NLS-1$
+ IEditorInput editorInput = new FileEditorInput(file);
+ JBIDE4509Test.checkOpenOnInEditor(editorInput, getEditorId(file.getName()), 14, 16, "echo.xhtml"); //$NON-NLS-1$
+ }
/**
* Function for checking openOn functionality in jar file;
*
15 years, 1 month
JBoss Tools SVN: r19150 - trunk/jsf/plugins/org.jboss.tools.jsf.text.ext/src/org/jboss/tools/jsf/text/ext/hyperlink.
by jbosstools-commits＠lists.jboss.org
Author: scabanovich
Date: 2009-12-09 06:53:43 -0500 (Wed, 09 Dec 2009)
New Revision: 19150
Modified:
trunk/jsf/plugins/org.jboss.tools.jsf.text.ext/src/org/jboss/tools/jsf/text/ext/hyperlink/JsfJSPTagNameHyperlink.java
Log:
https://jira.jboss.org/jira/browse/JBIDE-5099
Modified: trunk/jsf/plugins/org.jboss.tools.jsf.text.ext/src/org/jboss/tools/jsf/text/ext/hyperlink/JsfJSPTagNameHyperlink.java
===================================================================
--- trunk/jsf/plugins/org.jboss.tools.jsf.text.ext/src/org/jboss/tools/jsf/text/ext/hyperlink/JsfJSPTagNameHyperlink.java 2009-12-09 11:38:25 UTC (rev 19149)
+++ trunk/jsf/plugins/org.jboss.tools.jsf.text.ext/src/org/jboss/tools/jsf/text/ext/hyperlink/JsfJSPTagNameHyperlink.java 2009-12-09 11:53:43 UTC (rev 19150)
@@ -22,6 +22,8 @@
import org.eclipse.ui.IEditorPart;
import org.eclipse.wst.xml.core.internal.provisional.document.IDOMElement;
import org.jboss.tools.common.model.XModel;
+import org.jboss.tools.common.model.XModelObject;
+import org.jboss.tools.common.model.util.FindObjectHelper;
import org.jboss.tools.common.text.ext.hyperlink.AbstractHyperlink;
import org.jboss.tools.jst.text.ext.hyperlink.jsp.JSPRootHyperlinkPartitioner;
import org.jboss.tools.common.text.ext.util.StructuredModelWrapper;
@@ -90,10 +92,22 @@
if(c != null) {
IResource r = ((AbstractComponent)c).getResource();
if(r instanceof IFile) {
+ IEditorPart part = null;
IFile f = (IFile)r;
- IEditorPart part = openFileInEditor(f);
- if(part == null) {
- error = "Cannot open file " + r;
+ if(f.getFullPath() != null && f.getFullPath().toString().endsWith(".jar")) {
+ Object id = ((AbstractComponent)c).getId();
+ if(id instanceof XModelObject) {
+ XModelObject o = (XModelObject)id;
+ int q = FindObjectHelper.findModelObject(o, FindObjectHelper.IN_EDITOR_ONLY);
+ if(q == 1) {
+ error = "Cannot open resource " + r.getName();
+ }
+ }
+ } else {
+ part = openFileInEditor(f);
+ if(part == null) {
+ error = "Cannot open file " + r;
+ }
}
} else {
error = "Cannot find file for tag " + tagName;
15 years, 1 month
JBoss Tools SVN: r19149 - trunk/jsf/tests/org.jboss.tools.jsf.vpe.jsf.test/resources/jsf2test.
by jbosstools-commits＠lists.jboss.org
Author: scabanovich
Date: 2009-12-09 06:38:25 -0500 (Wed, 09 Dec 2009)
New Revision: 19149
Modified:
trunk/jsf/tests/org.jboss.tools.jsf.vpe.jsf.test/resources/jsf2test/.project
Log:
https://jira.jboss.org/jira/browse/JBIDE-5099
Modified: trunk/jsf/tests/org.jboss.tools.jsf.vpe.jsf.test/resources/jsf2test/.project
===================================================================
--- trunk/jsf/tests/org.jboss.tools.jsf.vpe.jsf.test/resources/jsf2test/.project 2009-12-09 10:23:41 UTC (rev 19148)
+++ trunk/jsf/tests/org.jboss.tools.jsf.vpe.jsf.test/resources/jsf2test/.project 2009-12-09 11:38:25 UTC (rev 19149)
@@ -15,6 +15,11 @@
<arguments>
</arguments>
</buildCommand>
+ <buildCommand>
+ <name>org.jboss.tools.jst.web.kb.kbbuilder</name>
+ <arguments>
+ </arguments>
+ </buildCommand>
</buildSpec>
<natures>
<nature>org.eclipse.jem.workbench.JavaEMFNature</nature>
@@ -22,5 +27,6 @@
<nature>org.eclipse.wst.common.modulecore.ModuleCoreNature</nature>
<nature>org.jboss.tools.jsf.jsfnature</nature>
<nature>org.eclipse.wst.common.project.facet.core.nature</nature>
+ <nature>org.jboss.tools.jst.web.kb.kbnature</nature>
</natures>
</projectDescription>
15 years, 1 month
JBoss Tools SVN: r19148 - in trunk/bpel/plugins/org.eclipse.bpel.validator/src/org/eclipse/bpel/validator: model and 1 other directories.
by jbosstools-commits＠lists.jboss.org
Author: dennyxu
Date: 2009-12-09 05:23:41 -0500 (Wed, 09 Dec 2009)
New Revision: 19148
Modified:
trunk/bpel/plugins/org.eclipse.bpel.validator/src/org/eclipse/bpel/validator/Main.java
trunk/bpel/plugins/org.eclipse.bpel.validator/src/org/eclipse/bpel/validator/ModelQuery.java
trunk/bpel/plugins/org.eclipse.bpel.validator/src/org/eclipse/bpel/validator/model/IConstants.java
trunk/bpel/plugins/org.eclipse.bpel.validator/src/org/eclipse/bpel/validator/rules/CValidator.java
trunk/bpel/plugins/org.eclipse.bpel.validator/src/org/eclipse/bpel/validator/rules/FromValidator.java
Log:
JBIDE-5393:BPEL validation errors in hello_world_header_ode riftsaw quickstart sample
Modified: trunk/bpel/plugins/org.eclipse.bpel.validator/src/org/eclipse/bpel/validator/Main.java
===================================================================
--- trunk/bpel/plugins/org.eclipse.bpel.validator/src/org/eclipse/bpel/validator/Main.java 2009-12-09 09:34:32 UTC (rev 19147)
+++ trunk/bpel/plugins/org.eclipse.bpel.validator/src/org/eclipse/bpel/validator/Main.java 2009-12-09 10:23:41 UTC (rev 19148)
@@ -182,6 +182,8 @@
WSDLElement wsdle = (WSDLElement) obj;
Element el = wsdle.getElement();
if (el != null) {
+// System.out.println(el.getOwnerDocument().getDocumentURI() + " " + el.getLocalName() + "----" + obj);
+
el.setUserData("emf.model", obj, null); //$NON-NLS-1$
}
}
Modified: trunk/bpel/plugins/org.eclipse.bpel.validator/src/org/eclipse/bpel/validator/ModelQuery.java
===================================================================
--- trunk/bpel/plugins/org.eclipse.bpel.validator/src/org/eclipse/bpel/validator/ModelQuery.java 2009-12-09 09:34:32 UTC (rev 19147)
+++ trunk/bpel/plugins/org.eclipse.bpel.validator/src/org/eclipse/bpel/validator/ModelQuery.java 2009-12-09 10:23:41 UTC (rev 19148)
@@ -200,6 +200,8 @@
}
// set it.
+// System.out.println(elm.getOwnerDocument().getDocumentURI() + " " + elm.getLocalName() + "----" + obj);
+
elm.setUserData("emf.model", eObj, null);
@@ -217,6 +219,8 @@
domElement = ((XSDConcreteComponent)next).getElement();
}
if ( domElement != null ) {
+// System.out.println(elm.getOwnerDocument().getDocumentURI() + " " + elm.getLocalName() + "----" + next);
+
domElement.setUserData("emf.model",next,null);
}
}
Modified: trunk/bpel/plugins/org.eclipse.bpel.validator/src/org/eclipse/bpel/validator/model/IConstants.java
===================================================================
--- trunk/bpel/plugins/org.eclipse.bpel.validator/src/org/eclipse/bpel/validator/model/IConstants.java 2009-12-09 09:34:32 UTC (rev 19147)
+++ trunk/bpel/plugins/org.eclipse.bpel.validator/src/org/eclipse/bpel/validator/model/IConstants.java 2009-12-09 10:23:41 UTC (rev 19148)
@@ -250,6 +250,7 @@
public static final QName AT_OUTPUT_VARIABLE = new QName("outputVariable");
public static final QName AT_CREATE_INSTANCE = new QName("createInstance");
public static final QName AT_PART = new QName("part");
+ public static final QName AT_HEADER = new QName("header");
public static final QName AT_QUERY = new QName("query");
public static final QName AT_OPAQUE = new QName("opaque");
public static final QName AT_PROPERTY = new QName("property");
Modified: trunk/bpel/plugins/org.eclipse.bpel.validator/src/org/eclipse/bpel/validator/rules/CValidator.java
===================================================================
--- trunk/bpel/plugins/org.eclipse.bpel.validator/src/org/eclipse/bpel/validator/rules/CValidator.java 2009-12-09 09:34:32 UTC (rev 19147)
+++ trunk/bpel/plugins/org.eclipse.bpel.validator/src/org/eclipse/bpel/validator/rules/CValidator.java 2009-12-09 10:23:41 UTC (rev 19148)
@@ -277,7 +277,7 @@
* @param toNode
*/
public void compatibleCopyCheck ( INode fromNode, INode toNode ) {
- int i =0;
+// int i =0;
INode fromTypeNode = getValue(fromNode,"type",null);
INode toTypeNode = getValue(toNode,"type",null);
@@ -303,6 +303,12 @@
return ;
}
+ String fHeaderName = getValue(fromNode, "header", null);
+ //if there is a header defined in from, it should ODE ws-bpel extension, so ignore
+ //the compatibleCopyCheck
+ if(!isEmpty(fHeaderName)){
+ return ;
+ }
// source -> destination
boolean bCompatible = mModelQuery.check(IModelQueryLookups.TEST_COMPATIBLE_TYPE, fromTypeNode, toTypeNode);
Modified: trunk/bpel/plugins/org.eclipse.bpel.validator/src/org/eclipse/bpel/validator/rules/FromValidator.java
===================================================================
--- trunk/bpel/plugins/org.eclipse.bpel.validator/src/org/eclipse/bpel/validator/rules/FromValidator.java 2009-12-09 09:34:32 UTC (rev 19147)
+++ trunk/bpel/plugins/org.eclipse.bpel.validator/src/org/eclipse/bpel/validator/rules/FromValidator.java 2009-12-09 10:23:41 UTC (rev 19148)
@@ -94,6 +94,8 @@
protected String fPartName;
+ protected String fHeaderName;
+
/**
*
*/
@@ -101,13 +103,14 @@
@Override
protected void start () {
super.start();
-
fVariableNode = mModelQuery.lookup(mNode,
IModelQueryLookups.LOOKUP_NODE_VARIABLE,
mNode.getAttribute(AT_VARIABLE));
fPartName = mNode.getAttribute(AT_PART);
+ fHeaderName = mNode.getAttribute(AT_HEADER);
+
fQueryNode = mNode.getNode(ND_QUERY);
fPartnerLinkNode = mModelQuery.lookup(mNode,
@@ -146,6 +149,10 @@
variant += 1;
}
+ if(!isEmpty(fHeaderName)){
+ setValue("header", fHeaderName);
+ }
+
if (fVariableNode != null) {
variant += 1;
15 years, 1 month
JBoss Tools SVN: r19147 - trunk/seam/plugins/org.jboss.tools.seam.core/src/org/jboss/tools/seam/internal/core/project/facet.
by jbosstools-commits＠lists.jboss.org
Author: akazakov
Date: 2009-12-09 04:34:32 -0500 (Wed, 09 Dec 2009)
New Revision: 19147
Modified:
trunk/seam/plugins/org.jboss.tools.seam.core/src/org/jboss/tools/seam/internal/core/project/facet/Seam2FacetInstallDelegate.java
trunk/seam/plugins/org.jboss.tools.seam.core/src/org/jboss/tools/seam/internal/core/project/facet/SeamFacetInstallDelegate.java
Log:
https://jira.jboss.org/jira/browse/JBIDE-5425
Modified: trunk/seam/plugins/org.jboss.tools.seam.core/src/org/jboss/tools/seam/internal/core/project/facet/Seam2FacetInstallDelegate.java
===================================================================
--- trunk/seam/plugins/org.jboss.tools.seam.core/src/org/jboss/tools/seam/internal/core/project/facet/Seam2FacetInstallDelegate.java 2009-12-09 09:23:52 UTC (rev 19146)
+++ trunk/seam/plugins/org.jboss.tools.seam.core/src/org/jboss/tools/seam/internal/core/project/facet/Seam2FacetInstallDelegate.java 2009-12-09 09:34:32 UTC (rev 19147)
@@ -45,6 +45,7 @@
.include("drools-core.*\\.jar") //$NON-NLS-1$
.include("drools-api.*\\.jar") //$NON-NLS-1$
.include("jboss-el.*.jar") //$NON-NLS-1$
+ .include("jboss-seam-remoting\\.jar") //$NON-NLS-1$
.include("mvel.*\\.jar") //$NON-NLS-1$
.include("jbpm-jpdl.*\\.jar") //$NON-NLS-1$
.include("richfaces-api.*\\.jar"); //$NON-NLS-1$
@@ -90,7 +91,6 @@
.include("jboss-seam-ioc\\.jar") //$NON-NLS-1$
.include("jboss-seam-mail\\.jar") //$NON-NLS-1$
.include("jboss-seam-pdf\\.jar") //$NON-NLS-1$
- .include("jboss-seam-remoting\\.jar") //$NON-NLS-1$
.include("jboss-seam-ui\\.jar") //$NON-NLS-1$
.include("jboss-seam-excel\\.jar") //$NON-NLS-1$
.include("jxl\\.jar") //$NON-NLS-1$
Modified: trunk/seam/plugins/org.jboss.tools.seam.core/src/org/jboss/tools/seam/internal/core/project/facet/SeamFacetInstallDelegate.java
===================================================================
--- trunk/seam/plugins/org.jboss.tools.seam.core/src/org/jboss/tools/seam/internal/core/project/facet/SeamFacetInstallDelegate.java 2009-12-09 09:23:52 UTC (rev 19146)
+++ trunk/seam/plugins/org.jboss.tools.seam.core/src/org/jboss/tools/seam/internal/core/project/facet/SeamFacetInstallDelegate.java 2009-12-09 09:34:32 UTC (rev 19147)
@@ -56,6 +56,7 @@
.include("drools-core.*\\.jar") //$NON-NLS-1$
.include("janino.*\\.jar") //$NON-NLS-1$
.include("jboss-seam.jar") //$NON-NLS-1$
+ .include("jboss-seam-remoting\\.jar") //$NON-NLS-1$
.include("jbpm.*\\.jar") //$NON-NLS-1$
.include("security\\.drl") //$NON-NLS-1$
.include("stringtemplate.*\\.jar") //$NON-NLS-1$
@@ -101,7 +102,6 @@
.include("jboss-seam-ioc\\.jar") //$NON-NLS-1$
.include("jboss-seam-mail\\.jar") //$NON-NLS-1$
.include("jboss-seam-pdf\\.jar") //$NON-NLS-1$
- .include("jboss-seam-remoting\\.jar") //$NON-NLS-1$
.include("jboss-seam-ui\\.jar") //$NON-NLS-1$
.include("jsf-facelets\\.jar") //$NON-NLS-1$
.include("oscache.*\\.jar") //$NON-NLS-1$
15 years, 1 month
JBoss Tools SVN: r19146 - trunk/jsf/tests/org.jboss.tools.jsf.vpe.jsf.test/src/org/jboss/tools/jsf/vpe/jsf/test/jbide.
by jbosstools-commits＠lists.jboss.org
Author: dmaliarevich
Date: 2009-12-09 04:23:52 -0500 (Wed, 09 Dec 2009)
New Revision: 19146
Modified:
trunk/jsf/tests/org.jboss.tools.jsf.vpe.jsf.test/src/org/jboss/tools/jsf/vpe/jsf/test/jbide/TestFViewLocaleAttribute_JBIDE5218.java
Log:
https://jira.jboss.org/jira/browse/JBIDE-5218, Copyright notes were added to the junit test class.
Modified: trunk/jsf/tests/org.jboss.tools.jsf.vpe.jsf.test/src/org/jboss/tools/jsf/vpe/jsf/test/jbide/TestFViewLocaleAttribute_JBIDE5218.java
===================================================================
--- trunk/jsf/tests/org.jboss.tools.jsf.vpe.jsf.test/src/org/jboss/tools/jsf/vpe/jsf/test/jbide/TestFViewLocaleAttribute_JBIDE5218.java 2009-12-09 08:58:45 UTC (rev 19145)
+++ trunk/jsf/tests/org.jboss.tools.jsf.vpe.jsf.test/src/org/jboss/tools/jsf/vpe/jsf/test/jbide/TestFViewLocaleAttribute_JBIDE5218.java 2009-12-09 09:23:52 UTC (rev 19146)
@@ -1,3 +1,13 @@
+/*******************************************************************************
+ * Copyright (c) 2007-2009 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.test.jbide;
import org.jboss.tools.jsf.vpe.jsf.test.JsfAllTests;
15 years, 1 month