JBoss Tools SVN: r9408 - 28.07.2008 and 1 other directory.
by jbosstools-commits＠lists.jboss.org
Author: aklimkovich
Date: 2008-07-29 13:30:42 -0400 (Tue, 29 Jul 2008)
New Revision: 9408
Added:
trunk/documentation/qa/reports/Tests 28.07.2008/CA Verification_29.07.2008.htm
Log:
Added a file remotely
Added: trunk/documentation/qa/reports/Tests 28.07.2008/CA Verification_29.07.2008.htm
===================================================================
--- trunk/documentation/qa/reports/Tests 28.07.2008/CA Verification_29.07.2008.htm (rev 0)
+++ trunk/documentation/qa/reports/Tests 28.07.2008/CA Verification_29.07.2008.htm 2008-07-29 17:30:42 UTC (rev 9408)
@@ -0,0 +1,200 @@
+<!DOCTYPE HTML PUBLIC "-//W3C//DTD HTML 4.0 Transitional//EN">
+<HTML><HEAD><TITLE>Execution Report</TITLE>
+<STYLE>H1 {
+ COLOR: #4a5d75; FONT-FAMILY: 'Lucida Grande', Geneva, Verdana, Arial, sans-serif; BACKGROUND-COLOR: transparent
+}
+H2 {
+ COLOR: #4a5d75; FONT-FAMILY: 'Lucida Grande', Geneva, Verdana, Arial, sans-serif; BACKGROUND-COLOR: transparent
+}
+TR {
+ BACKGROUND-COLOR: #f5f5f5
+}
+TD {
+ BORDER-RIGHT: dimgray 1px solid; PADDING-RIGHT: 0.5em; BORDER-TOP: dimgray 1px solid; PADDING-LEFT: 0.5em; PADDING-BOTTOM: 0.15em; BORDER-LEFT: dimgray 1px solid; PADDING-TOP: 0.15em; BORDER-BOTTOM: dimgray 1px solid; FONT-FAMILY: 'Lucida Grande', Geneva, Verdana, Arial, sans-serif; BACKGROUND-COLOR: transparent
+}
+HR {
+ COLOR: #999; BORDER-COLLAPSE: collapse
+}
+BODY {
+ PADDING-RIGHT: 2em; PADDING-LEFT: 2em; FONT-SIZE: 12px; PADDING-BOTTOM: 0em; COLOR: #333; LINE-HEIGHT: 100%; PADDING-TOP: 0em; FONT-FAMILY: 'Lucida Grande', Geneva, Verdana, Arial, sans-serif; max-width: 55em
+}
+TABLE {
+ BORDER-RIGHT: dimgray 0px solid; BORDER-TOP: dimgray 0px solid; BORDER-LEFT: dimgray 0px solid; COLOR: #4a5d75; BORDER-BOTTOM: dimgray 0px solid; FONT-FAMILY: 'Lucida Grande', Geneva, Verdana, Arial, sans-serif
+}
+</STYLE>
+
+<META http-equiv=Content-Type content="text/html; charset=ISO-8859-5">
+<META content="MSHTML 6.00.2900.2180" name=GENERATOR></HEAD>
+<BODY bgColor=#f5f5f5>
+<CENTER>
+<H1>CA Verification</H1>
+<TABLE
+style="BORDER-TOP-WIDTH: 1pt; BORDER-LEFT-WIDTH: 1pt; BORDER-BOTTOM-WIDTH: 1pt; BORDER-RIGHT-WIDTH: 1pt"
+cellSpacing=0 cellPadding=4 width="100%" align=center>
+ <TBODY>
+ <TR bgColor=gray>
+ <TD><B>Exec Date</B></TD>
+ <TD><B>Test Name</B></TD>
+ <TD><B>Status</B></TD>
+ <TD><B>Bug Number</B></TD></TR>
+ <TR bgColor=papayawhip>
+ <TD style="BORDER-TOP-WIDTH: 1pt; BORDER-RIGHT-WIDTH: 1pt">29.07.2008</TD>
+ <TD style="BORDER-TOP-WIDTH: 1pt; BORDER-RIGHT-WIDTH: 1pt"> Content
+ Assist for JSF configuration file</TD>
+ <TD
+ style="BORDER-TOP-WIDTH: 1pt; COLOR: green; BORDER-RIGHT-WIDTH: 1pt">Passed</TD>
+ <TD style="BORDER-TOP-WIDTH: 1pt; BORDER-RIGHT-WIDTH: 1pt"><FONT
+ color=white size=1> </FONT></TD></TR>
+ <TR bgColor=seashell>
+ <TD style="BORDER-TOP-WIDTH: 1pt; BORDER-RIGHT-WIDTH: 1pt">29.07.2008</TD>
+ <TD style="BORDER-TOP-WIDTH: 1pt; BORDER-RIGHT-WIDTH: 1pt"> Content
+ Assist for JSF JSP file</TD>
+ <TD
+ style="BORDER-TOP-WIDTH: 1pt; COLOR: green; BORDER-RIGHT-WIDTH: 1pt">Passed</TD>
+ <TD style="BORDER-TOP-WIDTH: 1pt; BORDER-RIGHT-WIDTH: 1pt"><FONT
+ color=white size=1> </FONT></TD></TR>
+ <TR bgColor=papayawhip>
+ <TD style="BORDER-TOP-WIDTH: 1pt; BORDER-RIGHT-WIDTH: 1pt">29.07.2008</TD>
+ <TD style="BORDER-TOP-WIDTH: 1pt; BORDER-RIGHT-WIDTH: 1pt"> Content
+ Assist for Struts Configuration File</TD>
+ <TD
+ style="BORDER-TOP-WIDTH: 1pt; COLOR: red; BORDER-RIGHT-WIDTH: 1pt">Failed</TD>
+ <TD
+style="BORDER-TOP-WIDTH: 1pt; BORDER-RIGHT-WIDTH: 1pt">JBIDE-2586</TD></TR>
+ <TR bgColor=seashell>
+ <TD style="BORDER-TOP-WIDTH: 1pt; BORDER-RIGHT-WIDTH: 1pt">29.07.2008</TD>
+ <TD style="BORDER-TOP-WIDTH: 1pt; BORDER-RIGHT-WIDTH: 1pt"> Content
+ Assist for Struts JSP File</TD>
+ <TD
+ style="BORDER-TOP-WIDTH: 1pt; COLOR: green; BORDER-RIGHT-WIDTH: 1pt">Passed</TD>
+ <TD style="BORDER-TOP-WIDTH: 1pt; BORDER-RIGHT-WIDTH: 1pt"><FONT
+ color=white size=1> </FONT></TD></TR>
+ <TR bgColor=papayawhip>
+ <TD style="BORDER-TOP-WIDTH: 1pt; BORDER-RIGHT-WIDTH: 1pt">29.07.2008</TD>
+ <TD style="BORDER-TOP-WIDTH: 1pt; BORDER-RIGHT-WIDTH: 1pt"> Content
+ Assist for JSF Tags</TD>
+ <TD
+ style="BORDER-TOP-WIDTH: 1pt; COLOR: green; BORDER-RIGHT-WIDTH: 1pt">Passed</TD>
+ <TD style="BORDER-TOP-WIDTH: 1pt; BORDER-RIGHT-WIDTH: 1pt"><FONT
+ color=white size=1> </FONT></TD></TR>
+ <TR bgColor=seashell>
+ <TD style="BORDER-TOP-WIDTH: 1pt; BORDER-RIGHT-WIDTH: 1pt">29.07.2008</TD>
+ <TD style="BORDER-TOP-WIDTH: 1pt; BORDER-RIGHT-WIDTH: 1pt"> Content
+ Assist for HTML Tags</TD>
+ <TD
+ style="BORDER-TOP-WIDTH: 1pt; COLOR: green; BORDER-RIGHT-WIDTH: 1pt">Passed</TD>
+ <TD style="BORDER-TOP-WIDTH: 1pt; BORDER-RIGHT-WIDTH: 1pt"><FONT
+ color=white size=1> </FONT></TD></TR>
+ <TR bgColor=papayawhip>
+ <TD style="BORDER-TOP-WIDTH: 1pt; BORDER-RIGHT-WIDTH: 1pt">29.07.2008</TD>
+ <TD style="BORDER-TOP-WIDTH: 1pt; BORDER-RIGHT-WIDTH: 1pt"> Content
+ Assist for JavaScript Tags</TD>
+ <TD
+ style="BORDER-TOP-WIDTH: 1pt; COLOR: green; BORDER-RIGHT-WIDTH: 1pt">Passed</TD>
+ <TD style="BORDER-TOP-WIDTH: 1pt; BORDER-RIGHT-WIDTH: 1pt"><FONT
+ color=white size=1> </FONT></TD></TR>
+ <TR bgColor=seashell>
+ <TD style="BORDER-TOP-WIDTH: 1pt; BORDER-RIGHT-WIDTH: 1pt">29.07.2008</TD>
+ <TD style="BORDER-TOP-WIDTH: 1pt; BORDER-RIGHT-WIDTH: 1pt"> Content
+ Assist for JSF Configuration file (Tree tab)</TD>
+ <TD
+ style="BORDER-TOP-WIDTH: 1pt; COLOR: green; BORDER-RIGHT-WIDTH: 1pt">Passed</TD>
+ <TD style="BORDER-TOP-WIDTH: 1pt; BORDER-RIGHT-WIDTH: 1pt"><FONT
+ color=white size=1> </FONT></TD></TR>
+ <TR bgColor=papayawhip>
+ <TD style="BORDER-TOP-WIDTH: 1pt; BORDER-RIGHT-WIDTH: 1pt">29.07.2008</TD>
+ <TD style="BORDER-TOP-WIDTH: 1pt; BORDER-RIGHT-WIDTH: 1pt"> Content
+ Assist for Resource Bundles</TD>
+ <TD
+ style="BORDER-TOP-WIDTH: 1pt; COLOR: green; BORDER-RIGHT-WIDTH: 1pt">Passed</TD>
+ <TD style="BORDER-TOP-WIDTH: 1pt; BORDER-RIGHT-WIDTH: 1pt"><FONT
+ color=white size=1> </FONT></TD></TR>
+ <TR bgColor=seashell>
+ <TD style="BORDER-TOP-WIDTH: 1pt; BORDER-RIGHT-WIDTH: 1pt">29.07.2008</TD>
+ <TD style="BORDER-TOP-WIDTH: 1pt; BORDER-RIGHT-WIDTH: 1pt"> Content
+ Assist for TLDs version=2.1</TD>
+ <TD
+ style="BORDER-TOP-WIDTH: 1pt; COLOR: green; BORDER-RIGHT-WIDTH: 1pt">Passed</TD>
+ <TD style="BORDER-TOP-WIDTH: 1pt; BORDER-RIGHT-WIDTH: 1pt"><FONT
+ color=white size=1> </FONT></TD></TR>
+ <TR bgColor=papayawhip>
+ <TD style="BORDER-TOP-WIDTH: 1pt; BORDER-RIGHT-WIDTH: 1pt">29.07.2008</TD>
+ <TD style="BORDER-TOP-WIDTH: 1pt; BORDER-RIGHT-WIDTH: 1pt"> Content
+ Assist with EL for JSP file</TD>
+ <TD
+ style="BORDER-TOP-WIDTH: 1pt; COLOR: green; BORDER-RIGHT-WIDTH: 1pt">Passed</TD>
+ <TD style="BORDER-TOP-WIDTH: 1pt; BORDER-RIGHT-WIDTH: 1pt"><FONT
+ color=white size=1> </FONT></TD></TR>
+ <TR bgColor=seashell>
+ <TD style="BORDER-TOP-WIDTH: 1pt; BORDER-RIGHT-WIDTH: 1pt">29.07.2008</TD>
+ <TD style="BORDER-TOP-WIDTH: 1pt; BORDER-RIGHT-WIDTH: 1pt"> Content
+ Assist in JSP file (no space between inverted commas in atribute
+value).</TD>
+ <TD
+ style="BORDER-TOP-WIDTH: 1pt; COLOR: green; BORDER-RIGHT-WIDTH: 1pt">Passed</TD>
+ <TD style="BORDER-TOP-WIDTH: 1pt; BORDER-RIGHT-WIDTH: 1pt"><FONT
+ color=white size=1> </FONT></TD></TR>
+ <TR bgColor=papayawhip>
+ <TD style="BORDER-TOP-WIDTH: 1pt; BORDER-RIGHT-WIDTH: 1pt">29.07.2008</TD>
+ <TD style="BORDER-TOP-WIDTH: 1pt; BORDER-RIGHT-WIDTH: 1pt"> Content
+ Assist for facelets Tags Xhtml file</TD>
+ <TD
+ style="BORDER-TOP-WIDTH: 1pt; COLOR: green; BORDER-RIGHT-WIDTH: 1pt">Passed</TD>
+ <TD style="BORDER-TOP-WIDTH: 1pt; BORDER-RIGHT-WIDTH: 1pt"><FONT
+ color=white size=1> </FONT></TD></TR>
+ <TR bgColor=seashell>
+ <TD style="BORDER-TOP-WIDTH: 1pt; BORDER-RIGHT-WIDTH: 1pt">29.07.2008</TD>
+ <TD style="BORDER-TOP-WIDTH: 1pt; BORDER-RIGHT-WIDTH: 1pt"> Tag auto
+ complete in JSF editor</TD>
+ <TD
+ style="BORDER-TOP-WIDTH: 1pt; COLOR: green; BORDER-RIGHT-WIDTH: 1pt">Passed</TD>
+ <TD style="BORDER-TOP-WIDTH: 1pt; BORDER-RIGHT-WIDTH: 1pt"><FONT
+ color=white size=1> </FONT></TD></TR>
+ <TR bgColor=papayawhip>
+ <TD style="BORDER-TOP-WIDTH: 1pt; BORDER-RIGHT-WIDTH: 1pt">29.07.2008</TD>
+ <TD style="BORDER-TOP-WIDTH: 1pt; BORDER-RIGHT-WIDTH: 1pt"> CA when
+ there is NO trailing quote</TD>
+ <TD
+ style="BORDER-TOP-WIDTH: 1pt; COLOR: green; BORDER-RIGHT-WIDTH: 1pt">Passed</TD>
+ <TD style="BORDER-TOP-WIDTH: 1pt; BORDER-RIGHT-WIDTH: 1pt"><FONT
+ color=white size=1> </FONT></TD></TR>
+ <TR bgColor=seashell>
+ <TD style="BORDER-TOP-WIDTH: 1pt; BORDER-RIGHT-WIDTH: 1pt">29.07.2008</TD>
+ <TD style="BORDER-TOP-WIDTH: 1pt; BORDER-RIGHT-WIDTH: 1pt"> Verification
+ of proposal list that containes Seam EL</TD>
+ <TD
+ style="BORDER-TOP-WIDTH: 1pt; COLOR: green; BORDER-RIGHT-WIDTH: 1pt">Passed</TD>
+ <TD style="BORDER-TOP-WIDTH: 1pt; BORDER-RIGHT-WIDTH: 1pt"><FONT
+ color=white size=1> </FONT></TD></TR>
+ <TR bgColor=papayawhip>
+ <TD style="BORDER-TOP-WIDTH: 1pt; BORDER-RIGHT-WIDTH: 1pt">29.07.2008</TD>
+ <TD style="BORDER-TOP-WIDTH: 1pt; BORDER-RIGHT-WIDTH: 1pt"> JSF EL CA
+ should add EL to attribute value but not replace whole not-EL value.</TD>
+ <TD
+ style="BORDER-TOP-WIDTH: 1pt; COLOR: green; BORDER-RIGHT-WIDTH: 1pt">Passed</TD>
+ <TD style="BORDER-TOP-WIDTH: 1pt; BORDER-RIGHT-WIDTH: 1pt"><FONT
+ color=white size=1> </FONT></TD></TR>
+ <TR bgColor=seashell>
+ <TD style="BORDER-TOP-WIDTH: 1pt; BORDER-RIGHT-WIDTH: 1pt">29.07.2008</TD>
+ <TD style="BORDER-TOP-WIDTH: 1pt; BORDER-RIGHT-WIDTH: 1pt"> Verification
+ of CA auto complete</TD>
+ <TD
+ style="BORDER-TOP-WIDTH: 1pt; COLOR: red; BORDER-RIGHT-WIDTH: 1pt">Failed</TD>
+ <TD
+style="BORDER-TOP-WIDTH: 1pt; BORDER-RIGHT-WIDTH: 1pt">JBIDE-2401</TD></TR>
+ <TR bgColor=papayawhip>
+ <TD style="BORDER-TOP-WIDTH: 1pt; BORDER-RIGHT-WIDTH: 1pt">29.07.2008</TD>
+ <TD style="BORDER-TOP-WIDTH: 1pt; BORDER-RIGHT-WIDTH: 1pt"> Seam EL in
+ proposal list of CA if there is no space between { and end of tag.</TD>
+ <TD
+ style="BORDER-TOP-WIDTH: 1pt; COLOR: red; BORDER-RIGHT-WIDTH: 1pt">Failed</TD>
+ <TD
+style="BORDER-TOP-WIDTH: 1pt; BORDER-RIGHT-WIDTH: 1pt">JBIDE-2394</TD></TR>
+ <TR bgColor=seashell>
+ <TD style="BORDER-TOP-WIDTH: 1pt; BORDER-RIGHT-WIDTH: 1pt">29.07.2008</TD>
+ <TD style="BORDER-TOP-WIDTH: 1pt; BORDER-RIGHT-WIDTH: 1pt"> Seam EL in
+ proposal list of CA if there is no trailing quote</TD>
+ <TD
+ style="BORDER-TOP-WIDTH: 1pt; COLOR: red; BORDER-RIGHT-WIDTH: 1pt">Failed</TD>
+ <TD
+ style="BORDER-TOP-WIDTH: 1pt; BORDER-RIGHT-WIDTH: 1pt">JBIDE-2462</TD></TR></TBODY></TABLE></CENTER></BODY></HTML>
16 years, 5 months
JBoss Tools SVN: r9407 - trunk/jsf/plugins/org.jboss.tools.jsf.vpe.richfaces/src/org/jboss/tools/jsf/vpe/richfaces/template.
by jbosstools-commits＠lists.jboss.org
Author: estherbin
Date: 2008-07-29 13:01:05 -0400 (Tue, 29 Jul 2008)
New Revision: 9407
Modified:
trunk/jsf/plugins/org.jboss.tools.jsf.vpe.richfaces/src/org/jboss/tools/jsf/vpe/richfaces/template/RichFacesInplaceSelectTemplate.java
Log:
fix
Modified: trunk/jsf/plugins/org.jboss.tools.jsf.vpe.richfaces/src/org/jboss/tools/jsf/vpe/richfaces/template/RichFacesInplaceSelectTemplate.java
===================================================================
--- trunk/jsf/plugins/org.jboss.tools.jsf.vpe.richfaces/src/org/jboss/tools/jsf/vpe/richfaces/template/RichFacesInplaceSelectTemplate.java 2008-07-29 16:52:17 UTC (rev 9406)
+++ trunk/jsf/plugins/org.jboss.tools.jsf.vpe.richfaces/src/org/jboss/tools/jsf/vpe/richfaces/template/RichFacesInplaceSelectTemplate.java 2008-07-29 17:01:05 UTC (rev 9407)
@@ -100,8 +100,8 @@
rootSpan.appendChild(visualDocument.createTextNode(getValue()));
}
data = new VpeCreationData(rootSpan);
- DOMTreeDumper d = new DOMTreeDumper();
- d.dumpToStream(System.err, rootSpan);
+// DOMTreeDumper d = new DOMTreeDumper();
+// d.dumpToStream(System.err, rootSpan);
return data;
}
16 years, 5 months
JBoss Tools SVN: r9406 - in trunk/jsf/plugins/org.jboss.tools.jsf.vpe.richfaces: src/org/jboss/tools/jsf/vpe/richfaces/template and 1 other directory.
by jbosstools-commits＠lists.jboss.org
Author: estherbin
Date: 2008-07-29 12:52:17 -0400 (Tue, 29 Jul 2008)
New Revision: 9406
Modified:
trunk/jsf/plugins/org.jboss.tools.jsf.vpe.richfaces/META-INF/MANIFEST.MF
trunk/jsf/plugins/org.jboss.tools.jsf.vpe.richfaces/src/org/jboss/tools/jsf/vpe/richfaces/template/RichFacesAbstractInplaceTemplate.java
Log:
Implements https://jira.jboss.org/jira/browse/JBIDE-2582
Modified: trunk/jsf/plugins/org.jboss.tools.jsf.vpe.richfaces/META-INF/MANIFEST.MF
===================================================================
--- trunk/jsf/plugins/org.jboss.tools.jsf.vpe.richfaces/META-INF/MANIFEST.MF 2008-07-29 16:50:45 UTC (rev 9405)
+++ trunk/jsf/plugins/org.jboss.tools.jsf.vpe.richfaces/META-INF/MANIFEST.MF 2008-07-29 16:52:17 UTC (rev 9406)
@@ -20,3 +20,4 @@
Bundle-Vendor: Red Hat, Inc.
Bundle-ClassPath: lib/jhighlight-1.0.jar,
.
+Export-Package: org.jboss.tools.jsf.vpe.richfaces
Modified: trunk/jsf/plugins/org.jboss.tools.jsf.vpe.richfaces/src/org/jboss/tools/jsf/vpe/richfaces/template/RichFacesAbstractInplaceTemplate.java
===================================================================
--- trunk/jsf/plugins/org.jboss.tools.jsf.vpe.richfaces/src/org/jboss/tools/jsf/vpe/richfaces/template/RichFacesAbstractInplaceTemplate.java 2008-07-29 16:50:45 UTC (rev 9405)
+++ trunk/jsf/plugins/org.jboss.tools.jsf.vpe.richfaces/src/org/jboss/tools/jsf/vpe/richfaces/template/RichFacesAbstractInplaceTemplate.java 2008-07-29 16:52:17 UTC (rev 9406)
@@ -304,15 +304,15 @@
if (ComponentUtil.isBlank(this.sourceValue)) {
this.sourceValue = DEFAULT_NULL_VALUE;
}
- if ((source.getAttributeNode("value") != null) && ComponentUtil.isNotBlank(this.sourceValue)
- && (this.sourceValue != DEFAULT_NULL_VALUE) && this.sourceValue.startsWith("#{")) {
- this.sourceValue = ComponentUtil.getBundleValue(pageContext, source.getAttributeNode("value"));
- }
-
- if ((source.getAttributeNode("defaultLabel") != null) && ComponentUtil.isNotBlank(this.defaultLabel)
- && (this.defaultLabel != DEFAULT_NULL_VALUE) && this.defaultLabel.startsWith("#{")) {
- this.defaultLabel = ComponentUtil.getBundleValue(pageContext, source.getAttributeNode("defaultLabel"));
- }
+// if ((source.getAttributeNode("value") != null) && ComponentUtil.isNotBlank(this.sourceValue)
+// && (this.sourceValue != DEFAULT_NULL_VALUE) && this.sourceValue.startsWith("#{")) {
+// this.sourceValue = ComponentUtil.getBundleValue(pageContext, source.getAttributeNode("value"));
+// }
+//
+// if ((source.getAttributeNode("defaultLabel") != null) && ComponentUtil.isNotBlank(this.defaultLabel)
+// && (this.defaultLabel != DEFAULT_NULL_VALUE) && this.defaultLabel.startsWith("#{")) {
+// this.defaultLabel = ComponentUtil.getBundleValue(pageContext, source.getAttributeNode("defaultLabel"));
+// }
this.showControls = Boolean.parseBoolean(source.getAttribute("showControls"));
this.controlsVerticalPosition = source.getAttribute("controlsVerticalPosition");
16 years, 5 months
JBoss Tools SVN: r9405 - in trunk/jsf/tests/org.jboss.tools.jsf.vpe.jsf.test/resources/jsfTest: WebContent/pages/JBIDE and 1 other directories.
by jbosstools-commits＠lists.jboss.org
Author: estherbin
Date: 2008-07-29 12:50:45 -0400 (Tue, 29 Jul 2008)
New Revision: 9405
Added:
trunk/jsf/tests/org.jboss.tools.jsf.vpe.jsf.test/resources/jsfTest/JavaSource/demo/Messages.properties
trunk/jsf/tests/org.jboss.tools.jsf.vpe.jsf.test/resources/jsfTest/WebContent/pages/JBIDE/2582/
trunk/jsf/tests/org.jboss.tools.jsf.vpe.jsf.test/resources/jsfTest/WebContent/pages/JBIDE/2582/page1.xhtml
Log:
Implements https://jira.jboss.org/jira/browse/JBIDE-2582
Added: trunk/jsf/tests/org.jboss.tools.jsf.vpe.jsf.test/resources/jsfTest/JavaSource/demo/Messages.properties
===================================================================
--- trunk/jsf/tests/org.jboss.tools.jsf.vpe.jsf.test/resources/jsfTest/JavaSource/demo/Messages.properties (rev 0)
+++ trunk/jsf/tests/org.jboss.tools.jsf.vpe.jsf.test/resources/jsfTest/JavaSource/demo/Messages.properties 2008-07-29 16:50:45 UTC (rev 9405)
@@ -0,0 +1,3 @@
+header=Hello Demo Application
+prompt_message=Name:
+hello_message=Hello
\ No newline at end of file
Property changes on: trunk/jsf/tests/org.jboss.tools.jsf.vpe.jsf.test/resources/jsfTest/JavaSource/demo/Messages.properties
___________________________________________________________________
Name: svn:mime-type
+ text/plain
Name: svn:eol-style
+ native
Added: trunk/jsf/tests/org.jboss.tools.jsf.vpe.jsf.test/resources/jsfTest/WebContent/pages/JBIDE/2582/page1.xhtml
===================================================================
--- trunk/jsf/tests/org.jboss.tools.jsf.vpe.jsf.test/resources/jsfTest/WebContent/pages/JBIDE/2582/page1.xhtml (rev 0)
+++ trunk/jsf/tests/org.jboss.tools.jsf.vpe.jsf.test/resources/jsfTest/WebContent/pages/JBIDE/2582/page1.xhtml 2008-07-29 16:50:45 UTC (rev 9405)
@@ -0,0 +1,16 @@
+<!DOCTYPE html PUBLIC "-//W3C//DTD XHTML 1.0 Transitional//EN" "http://www.w3.org/TR/xhtml1/DTD/xhtml1-transitional.dtd">
+<html xmlns="http://www.w3.org/1999/xhtml"
+ xmlns:ui="http://java.sun.com/jsf/facelets"
+ xmlns:h="http://java.sun.com/jsf/html"
+ xmlns:f="http://java.sun.com/jsf/core">
+
+<f:loadBundle basename="demo.Messages" var="msg" />
+<head>
+<title><ui:insert name="pageTitle">Page Title</ui:insert></title>
+</head>
+
+<body bgcolor="#ffffff">
+ <h:outputText value="#{msg.hello_message}"/>
+</body>
+
+</html>
\ No newline at end of file
Property changes on: trunk/jsf/tests/org.jboss.tools.jsf.vpe.jsf.test/resources/jsfTest/WebContent/pages/JBIDE/2582/page1.xhtml
___________________________________________________________________
Name: svn:mime-type
+ text/html
Name: svn:eol-style
+ native
16 years, 5 months
JBoss Tools SVN: r9404 - trunk/jsf/plugins/org.jboss.tools.jsf.vpe.jsf/src/org/jboss/tools/jsf/vpe/jsf/template.
by jbosstools-commits＠lists.jboss.org
Author: estherbin
Date: 2008-07-29 12:50:37 -0400 (Tue, 29 Jul 2008)
New Revision: 9404
Modified:
trunk/jsf/plugins/org.jboss.tools.jsf.vpe.jsf/src/org/jboss/tools/jsf/vpe/jsf/template/AbstractOutputJsfTemplate.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/JsfOutputFormatTemplate.java
Log:
Implements https://jira.jboss.org/jira/browse/JBIDE-2582
Modified: trunk/jsf/plugins/org.jboss.tools.jsf.vpe.jsf/src/org/jboss/tools/jsf/vpe/jsf/template/AbstractOutputJsfTemplate.java
===================================================================
--- trunk/jsf/plugins/org.jboss.tools.jsf.vpe.jsf/src/org/jboss/tools/jsf/vpe/jsf/template/AbstractOutputJsfTemplate.java 2008-07-29 16:49:34 UTC (rev 9403)
+++ trunk/jsf/plugins/org.jboss.tools.jsf.vpe.jsf/src/org/jboss/tools/jsf/vpe/jsf/template/AbstractOutputJsfTemplate.java 2008-07-29 16:50:37 UTC (rev 9404)
@@ -74,9 +74,7 @@
if (outputAttr != null) {
// prepare value
- String newValue = prepareAttrValue(pageContext, sourceElement,
- outputAttr);
-
+ String newValue = outputAttr.getValue();
// if escape then contents of value (or other attribute) is only
// text
if (!sourceElement.hasAttribute(JSF.ATTR_ESCAPE)
@@ -134,13 +132,14 @@
creationData.setElementData(elementData);
}
+
+ @Deprecated
+// protected String prepareAttrValue(VpePageContext pageContext,
+// Element parent, Attr attr) {
+//
+// return ComponentUtil.getBundleValue(pageContext, attr);
+// }
- protected String prepareAttrValue(VpePageContext pageContext,
- Element parent, Attr attr) {
-
- return ComponentUtil.getBundleValue(pageContext, attr);
- }
-
/*
* (non-Javadoc)
*
Modified: 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 2008-07-29 16:49:34 UTC (rev 9403)
+++ trunk/jsf/plugins/org.jboss.tools.jsf.vpe.jsf/src/org/jboss/tools/jsf/vpe/jsf/template/JsfOptionSelectItemTemplate.java 2008-07-29 16:50:37 UTC (rev 9404)
@@ -96,8 +96,7 @@
if (outputAttr != null) {
// prepare value
- String newValue = prepareAttrValue(pageContext, sourceElement,
- outputAttr);
+ String newValue = outputAttr.getValue();
// if escape then contents of value (or other attribute) is only
// text
Modified: trunk/jsf/plugins/org.jboss.tools.jsf.vpe.jsf/src/org/jboss/tools/jsf/vpe/jsf/template/JsfOutputFormatTemplate.java
===================================================================
--- trunk/jsf/plugins/org.jboss.tools.jsf.vpe.jsf/src/org/jboss/tools/jsf/vpe/jsf/template/JsfOutputFormatTemplate.java 2008-07-29 16:49:34 UTC (rev 9403)
+++ trunk/jsf/plugins/org.jboss.tools.jsf.vpe.jsf/src/org/jboss/tools/jsf/vpe/jsf/template/JsfOutputFormatTemplate.java 2008-07-29 16:50:37 UTC (rev 9404)
@@ -96,16 +96,7 @@
return true;
}
- @Override
- protected String prepareAttrValue(VpePageContext pageContext,
- Element parent, Attr attr) {
- int offset = ((IDOMAttr) attr).getValueRegionStartOffset();
- String newString = prepareAttrValueByParams(attr.getNodeValue(),
- getParams(parent));
- return ComponentUtil.getBundleValue(pageContext, newString, offset);
- }
-
/**
* find message format elements and update value
*
16 years, 5 months
JBoss Tools SVN: r9403 - trunk/vpe/tests/org.jboss.tools.vpe.test/src/org/jboss/tools/vpe/test.
by jbosstools-commits＠lists.jboss.org
Author: estherbin
Date: 2008-07-29 12:49:34 -0400 (Tue, 29 Jul 2008)
New Revision: 9403
Added:
trunk/vpe/tests/org.jboss.tools.vpe.test/src/org/jboss/tools/vpe/test/JBIDE2582Test.java
Modified:
trunk/vpe/tests/org.jboss.tools.vpe.test/src/org/jboss/tools/vpe/test/CommonJBIDE2010Test.java
trunk/vpe/tests/org.jboss.tools.vpe.test/src/org/jboss/tools/vpe/test/ElPreferencesTestCase.java
trunk/vpe/tests/org.jboss.tools.vpe.test/src/org/jboss/tools/vpe/test/VpeAllTests.java
Log:
Implements https://jira.jboss.org/jira/browse/JBIDE-2582
Modified: trunk/vpe/tests/org.jboss.tools.vpe.test/src/org/jboss/tools/vpe/test/CommonJBIDE2010Test.java
===================================================================
--- trunk/vpe/tests/org.jboss.tools.vpe.test/src/org/jboss/tools/vpe/test/CommonJBIDE2010Test.java 2008-07-29 16:48:43 UTC (rev 9402)
+++ trunk/vpe/tests/org.jboss.tools.vpe.test/src/org/jboss/tools/vpe/test/CommonJBIDE2010Test.java 2008-07-29 16:49:34 UTC (rev 9403)
@@ -1,13 +1,13 @@
-/*******************************************************************************
- * Copyright (c) 2007 Exadel, Inc. and Red Hat, Inc.
+/*******************************************************************************
+ * 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:
- * Exadel, Inc. and Red Hat, Inc. - initial API and implementation
- ******************************************************************************/
+ * Red Hat, Inc. - initial API and implementation
+ ******************************************************************************/
package org.jboss.tools.vpe.test;
@@ -92,7 +92,7 @@
elValuesMap.put(KEY_3, "/facesContext/");
elValuesMap.put(KEY_4, VALUE_4);
elValuesMap.put(KEY_5, VALUE_5);
- file = (IFile) TestUtil.getComponentPath(DIR_TEST_PAGE_NAME, IMPORT_PROJECT_NAME);
+ file = (IFile) TestUtil.getComponentPath(getOpenPageName(), getOpenProjectName());
ResourceReference[] entries = new ResourceReference[elValuesMap.size()];
int i = 0;
for (Entry<String, String> string : elValuesMap.entrySet()) {
@@ -101,10 +101,19 @@
entries[i].setProperties(string.getValue());
i++;
- setValues(entries);
+
}
+ setValues(entries);
}
+
+ protected String getOpenPageName(){
+ return DIR_TEST_PAGE_NAME;
+ }
+
+ protected String getOpenProjectName(){
+ return IMPORT_PROJECT_NAME;
+ }
/**
* Sets the values.
*
Modified: trunk/vpe/tests/org.jboss.tools.vpe.test/src/org/jboss/tools/vpe/test/ElPreferencesTestCase.java
===================================================================
--- trunk/vpe/tests/org.jboss.tools.vpe.test/src/org/jboss/tools/vpe/test/ElPreferencesTestCase.java 2008-07-29 16:48:43 UTC (rev 9402)
+++ trunk/vpe/tests/org.jboss.tools.vpe.test/src/org/jboss/tools/vpe/test/ElPreferencesTestCase.java 2008-07-29 16:49:34 UTC (rev 9403)
@@ -1,13 +1,13 @@
-/*******************************************************************************
- * Copyright (c) 2007 Exadel, Inc. and Red Hat, Inc.
+/*******************************************************************************
+ * 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:
- * Exadel, Inc. and Red Hat, Inc. - initial API and implementation
- ******************************************************************************/
+ * Red Hat, Inc. - initial API and implementation
+ ******************************************************************************/
package org.jboss.tools.vpe.test;
Added: trunk/vpe/tests/org.jboss.tools.vpe.test/src/org/jboss/tools/vpe/test/JBIDE2582Test.java
===================================================================
--- trunk/vpe/tests/org.jboss.tools.vpe.test/src/org/jboss/tools/vpe/test/JBIDE2582Test.java (rev 0)
+++ trunk/vpe/tests/org.jboss.tools.vpe.test/src/org/jboss/tools/vpe/test/JBIDE2582Test.java 2008-07-29 16:49:34 UTC (rev 9403)
@@ -0,0 +1,78 @@
+/*******************************************************************************
+ * 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.vpe.test;
+
+
+import java.util.ArrayList;
+import java.util.List;
+
+import org.eclipse.core.resources.IFile;
+import org.jboss.tools.vpe.editor.util.HTML;
+import org.jboss.tools.vpe.ui.test.TestUtil;
+import org.mozilla.interfaces.nsIDOMElement;
+import org.mozilla.interfaces.nsIDOMNode;
+
+
+/**
+ * Test case for testing <a
+ * href="https://jira.jboss.org/jira/browse/JBIDE-2582"> JBIDE-2582 </a> issue
+ *
+ * @author Evgenij Stherbin
+ */
+public class JBIDE2582Test extends CommonJBIDE2010Test {
+
+ /** The Constant DIR_TEST_PAGE_NAME_3. */
+ protected static final String PAGE_1 = "JBIDE/2582/page1.xhtml";
+
+ /**
+ * The Constructor.
+ *
+ * @param name the name
+ */
+ public JBIDE2582Test(String name) {
+ super(name);
+
+ }
+
+ /**
+ * Test rs substitution.
+ *
+ * @throws Throwable the throwable
+ */
+ public void testRsSubstitution() throws Throwable {
+ final nsIDOMElement rst = performTestForRichFacesComponent(file);
+
+ assertNotNull(rst);
+
+ final List<nsIDOMNode> elements = new ArrayList<nsIDOMNode>();
+
+ TestUtil.findAllElementsByName(rst, elements, HTML.TAG_SPAN);
+
+ assertEquals("Size should be equals 1", 1, elements.size());
+
+ final nsIDOMElement spanOne = (nsIDOMElement) elements.get(0).queryInterface(nsIDOMElement.NS_IDOMELEMENT_IID);
+
+ assertEquals("Style attribute should be substituted", "Hello", spanOne.getFirstChild().getNodeValue());
+
+ }
+
+ /**
+ * Gets the open page name.
+ *
+ * @return the open page name
+ */
+ protected String getOpenPageName() {
+ return PAGE_1;
+ }
+
+}
Property changes on: trunk/vpe/tests/org.jboss.tools.vpe.test/src/org/jboss/tools/vpe/test/JBIDE2582Test.java
___________________________________________________________________
Name: svn:mime-type
+ text/plain
Name: svn:keywords
+ Author Id Revision Date
Name: svn:eol-style
+ native
Modified: trunk/vpe/tests/org.jboss.tools.vpe.test/src/org/jboss/tools/vpe/test/VpeAllTests.java
===================================================================
--- trunk/vpe/tests/org.jboss.tools.vpe.test/src/org/jboss/tools/vpe/test/VpeAllTests.java 2008-07-29 16:48:43 UTC (rev 9402)
+++ trunk/vpe/tests/org.jboss.tools.vpe.test/src/org/jboss/tools/vpe/test/VpeAllTests.java 2008-07-29 16:49:34 UTC (rev 9403)
@@ -42,6 +42,7 @@
suite.addTestSuite(VpeTemplateManagerTest.class);
suite.addTestSuite(ElPreferencesTestCase.class);
suite.addTestSuite(JBIDE2010Test.class);
+ suite.addTestSuite(JBIDE2582Test.class);
List<ImportBean> projectToImport = new ArrayList<ImportBean>();
ImportBean importBean = new ImportBean();
16 years, 5 months
JBoss Tools SVN: r9402 - in trunk/vpe/plugins/org.jboss.tools.vpe: src/org/jboss/tools/vpe/editor/template and 1 other directories.
by jbosstools-commits＠lists.jboss.org
Author: estherbin
Date: 2008-07-29 12:48:43 -0400 (Tue, 29 Jul 2008)
New Revision: 9402
Modified:
trunk/vpe/plugins/org.jboss.tools.vpe/META-INF/MANIFEST.MF
trunk/vpe/plugins/org.jboss.tools.vpe/src/org/jboss/tools/vpe/editor/template/VpeAbstractTemplate.java
trunk/vpe/plugins/org.jboss.tools.vpe/src/org/jboss/tools/vpe/editor/util/ElService.java
trunk/vpe/plugins/org.jboss.tools.vpe/src/org/jboss/tools/vpe/editor/util/IELService.java
Log:
Implements https://jira.jboss.org/jira/browse/JBIDE-2582
Modified: trunk/vpe/plugins/org.jboss.tools.vpe/META-INF/MANIFEST.MF
===================================================================
--- trunk/vpe/plugins/org.jboss.tools.vpe/META-INF/MANIFEST.MF 2008-07-29 16:32:33 UTC (rev 9401)
+++ trunk/vpe/plugins/org.jboss.tools.vpe/META-INF/MANIFEST.MF 2008-07-29 16:48:43 UTC (rev 9402)
@@ -62,6 +62,7 @@
org.eclipse.ui.ide,
org.jboss.tools.vpe.xulrunner,
org.mozilla.xpcom,
- org.eclipse.draw2d
+ org.eclipse.draw2d,
+ org.jboss.tools.jsf.vpe.richfaces
Bundle-Version: 2.1.0
Modified: trunk/vpe/plugins/org.jboss.tools.vpe/src/org/jboss/tools/vpe/editor/template/VpeAbstractTemplate.java
===================================================================
--- trunk/vpe/plugins/org.jboss.tools.vpe/src/org/jboss/tools/vpe/editor/template/VpeAbstractTemplate.java 2008-07-29 16:32:33 UTC (rev 9401)
+++ trunk/vpe/plugins/org.jboss.tools.vpe/src/org/jboss/tools/vpe/editor/template/VpeAbstractTemplate.java 2008-07-29 16:48:43 UTC (rev 9402)
@@ -1480,14 +1480,15 @@
public void beforeTemplateCreated(VpePageContext pageContext, Node sourceNode, nsIDOMDocument domDocument) {
final IFile file = pageContext.getVisualBuilder().getCurrentIncludeInfo().getFile();
- if ((file != null) && ElService.getInstance().isAvailable(file)) {
+ if ((file != null)) {
// Node first((Element
Node text = sourceNode.getFirstChild();
- if(text instanceof Text){
- ((Text)text).setData(ElService.getInstance().replaceEl(file, ((TextImpl)text).getData()));
- }else if((sourceNode.getFirstChild()!=null) && (sourceNode.getFirstChild().getFirstChild() instanceof Text)){
+
+ if (text instanceof Text) {
+ ((Text) text).setData(ElService.getInstance().replaceEl(file, ((TextImpl) text).getData()));
+ } else if ((sourceNode.getFirstChild() != null) && (sourceNode.getFirstChild().getFirstChild() instanceof Text)) {
text = sourceNode.getFirstChild().getFirstChild();
- ((Text)text).setData(ElService.getInstance().replaceEl(file, ((TextImpl)text).getData()));
+ ((Text) text).setData(ElService.getInstance().replaceEl(file, ((TextImpl) text).getData()));
}
final NamedNodeMap nodeMap = sourceNode.getAttributes();
@@ -1495,7 +1496,7 @@
for (int i = 0; i < nodeMap.getLength(); i++) {
final Attr n = (Attr) nodeMap.item(i);
- n.setValue(ElService.getInstance().replaceEl(file, n.getValue()));
+ n.setValue(ElService.getInstance().replaceElAndResources(pageContext,n));
}
if ((sourceNode.getChildNodes() != null) && (sourceNode.getChildNodes().getLength() > 0)) {
Modified: trunk/vpe/plugins/org.jboss.tools.vpe/src/org/jboss/tools/vpe/editor/util/ElService.java
===================================================================
--- trunk/vpe/plugins/org.jboss.tools.vpe/src/org/jboss/tools/vpe/editor/util/ElService.java 2008-07-29 16:32:33 UTC (rev 9401)
+++ trunk/vpe/plugins/org.jboss.tools.vpe/src/org/jboss/tools/vpe/editor/util/ElService.java 2008-07-29 16:48:43 UTC (rev 9402)
@@ -1,12 +1,12 @@
-/*******************************************************************************
- * Copyright (c) 2007 Exadel, Inc. and Red Hat, Inc.
+/*******************************************************************************
+ * 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:
- * Exadel, Inc. and Red Hat, Inc. - initial API and implementation
+ * Red Hat, Inc. - initial API and implementation
******************************************************************************/
package org.jboss.tools.vpe.editor.util;
@@ -14,6 +14,8 @@
import org.eclipse.core.resources.IFile;
import org.eclipse.core.runtime.Assert;
+import org.jboss.tools.jsf.vpe.richfaces.ComponentUtil;
+import org.jboss.tools.vpe.editor.bundle.BundleMap;
import org.jboss.tools.vpe.editor.context.VpePageContext;
import org.jboss.tools.vpe.editor.css.ELReferenceList;
import org.jboss.tools.vpe.editor.css.ResourceReference;
@@ -31,7 +33,7 @@
public final class ElService implements IELService {
/** The Constant INSTANCE. */
- private static final ElService INSTANCE = new ElService();
+ private static final IELService INSTANCE = new ElService();
/**
* Checks if is available.
@@ -78,9 +80,10 @@
*
* @see IELService#getReplacedElValue(IFile, String)
*/
+ //@Deprecated
public String replaceEl(IFile resourceFile, String resourceString) {
// Assert.isNotNull(resourceString);
- if(resourceString == null){
+ if ((resourceString == null) || (resourceFile == null)) {
return "";
}
Assert.isNotNull(resourceFile);
@@ -126,13 +129,66 @@
boolean rst = false;
final IFile file = pageContext.getVisualBuilder().getCurrentIncludeInfo().getFile();
- if(this.isAvailable(file) && this.isAvailableForNode(sourceNode,file)){
+ if (((this.isAvailable(file) && this.isAvailableForNode(sourceNode, file))) || isInResourcesBundle(pageContext, sourceNode)){
rst = true;
}
return rst;
}
+ /**
+ *
+ * @param pageContext
+ * @param sourceNode
+ * @return
+ */
+ public boolean isInResourcesBundle(VpePageContext pageContext, Element sourceNode) {
+ boolean rst = false;
+ BundleMap bundleMap = pageContext.getBundle();
+
+ String textValue = null;
+ if (sourceNode.getFirstChild() != null && sourceNode.getFirstChild().getNodeType() == Node.TEXT_NODE) {
+ textValue = sourceNode.getFirstChild().getNodeValue();
+ }
+ if (textValue != null && textValue.contains("#{")) {
+ final String newValue = bundleMap.getBundleValue(sourceNode.getNodeValue(), 0);
+
+ if (!textValue.equals(newValue)) {
+ rst = true;
+ }
+ }
+ final NamedNodeMap nodeMap = sourceNode.getAttributes();
+
+ if (nodeMap != null && nodeMap.getLength() > 0) {
+ for (int i = 0; i < nodeMap.getLength(); i++) {
+ final Attr attr = (Attr) nodeMap.item(i);
+ final String value = attr.getValue();
+
+ if (value != null && value.contains("#{")) {
+ final String value2 = bundleMap.getBundleValue(value, 0);
+
+ if (!value2.equals(value)) {
+ rst = true;
+ break;
+ }
+ }
+ }
+ }
+// final NamedNodeMap nodeMap = sourceNode.getAttributes();
+//
+// if ((nodeMap != null) && (nodeMap.getLength() > 0)) {
+// for (int i = 0; i < nodeMap.getLength(); i++) {
+// if (isInResourcesBundle(pageContext, sourceNode)) {
+// rst = true;
+// break;
+// }
+// }
+// }
+
+ return rst;
+ }
+
+
/**
* Checks if is available for node.
*
@@ -210,4 +266,23 @@
return str;
}
+
+ public String replaceElAndResources(VpePageContext pageContext, Attr attributeNode) {
+ final IFile file = pageContext.getVisualBuilder().getCurrentIncludeInfo().getFile();
+ final String attribuString = attributeNode.getValue();
+ String rst = attribuString;
+
+ rst = ComponentUtil.getBundleValue(pageContext, attributeNode);
+
+ rst = replaceEl(file, rst);
+
+ return rst;
+ }
+
+// private String replaceResourceBundle(VpePageContext context,Attr attributeNode){
+//
+// }
+
+
+
}
Modified: trunk/vpe/plugins/org.jboss.tools.vpe/src/org/jboss/tools/vpe/editor/util/IELService.java
===================================================================
--- trunk/vpe/plugins/org.jboss.tools.vpe/src/org/jboss/tools/vpe/editor/util/IELService.java 2008-07-29 16:32:33 UTC (rev 9401)
+++ trunk/vpe/plugins/org.jboss.tools.vpe/src/org/jboss/tools/vpe/editor/util/IELService.java 2008-07-29 16:48:43 UTC (rev 9402)
@@ -1,10 +1,20 @@
+/*******************************************************************************
+ * 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.vpe.editor.util;
import org.eclipse.core.resources.IFile;
import org.jboss.tools.vpe.editor.context.VpePageContext;
+import org.w3c.dom.Attr;
import org.w3c.dom.Element;
@@ -25,10 +35,22 @@
*
* @return string where el values was substituted.
*/
+ //@Deprecated
String replaceEl(IFile resourceFile, String resourceString);
-
-
+
/**
+ * Replace el and resources.
+ *
+ * @param attributeNode the attribute node
+ * @param resourceFile the resource file
+ * @param resourceString the resource string
+ * @param pageContext the page context
+ *
+ * @return the string
+ */
+ String replaceElAndResources(VpePageContext pageContext, Attr attributeNode);
+
+ /**
* Reverse replace.
*
* @param resourceFile the resource file
@@ -36,7 +58,7 @@
*
* @return the string
*/
- String reverseReplace(IFile resourceFile,String replacedString);
+ String reverseReplace(IFile resourceFile, String replacedString);
/**
* Checks if is available.
@@ -56,5 +78,16 @@
* @return true, if is cloneable node
*/
public boolean isCloneableNode(VpePageContext pageContext, Element sourceNode);
+
+
+ /**
+ * Checks if is in resources bundle.
+ *
+ * @param sourceNode the source node
+ * @param pageContext the page context
+ *
+ * @return true, if is in resources bundle
+ */
+ boolean isInResourcesBundle(VpePageContext pageContext, Element sourceNode);
}
16 years, 5 months
JBoss Tools SVN: r9401 - in trunk: documentation/guides/Exadel-migration/en and 11 other directories.
by jbosstools-commits＠lists.jboss.org
Author: smukhina
Date: 2008-07-29 12:32:33 -0400 (Tue, 29 Jul 2008)
New Revision: 9401
Modified:
trunk/as/docs/reference/en/master.xml
trunk/documentation/guides/Exadel-migration/en/master.xml
trunk/documentation/guides/GettingStartedGuide/en/master.xml
trunk/documentation/jboss-tools-docs/index/en/master.xml
trunk/esb/docs/esb_ref_guide/en/master.xml
trunk/hibernatetools/docs/reference/en/master.xml
trunk/jbpm/docs/reference/en/master.xml
trunk/jsf/docs/jsf_tools_ref_guide/en/master.xml
trunk/jsf/docs/jsf_tools_tutorial/en/master.xml
trunk/jsf/docs/userguide/en/master.xml
trunk/seam/docs/reference/en/master.xml
trunk/struts/docs/struts_tools_ref_guide/en/master.xml
trunk/struts/docs/struts_tools_tutorial/en/master.xml
Log:
https://jira.jboss.org/jira/browse/RF-3937
syntax in schema definition is corrected
Modified: trunk/as/docs/reference/en/master.xml
===================================================================
--- trunk/as/docs/reference/en/master.xml 2008-07-29 15:43:49 UTC (rev 9400)
+++ trunk/as/docs/reference/en/master.xml 2008-07-29 16:32:33 UTC (rev 9401)
@@ -1,5 +1,5 @@
<?xml version="1.0" encoding="UTF-8"?>
-<!DOCTYPE book PUBLIC "-//OASIS//DTD DocBook XML V4.3CR3//EN"
+<!DOCTYPE book PUBLIC "-//OASIS//DTD DocBook XML V4.3//EN"
"http://www.docbook.org/xsd/4.3/docbook.xsd"
[<!ENTITY quick_start SYSTEM "modules/quick_start.xml">
Modified: trunk/documentation/guides/Exadel-migration/en/master.xml
===================================================================
--- trunk/documentation/guides/Exadel-migration/en/master.xml 2008-07-29 15:43:49 UTC (rev 9400)
+++ trunk/documentation/guides/Exadel-migration/en/master.xml 2008-07-29 16:32:33 UTC (rev 9401)
@@ -1,6 +1,6 @@
<?xml version="1.0" encoding="UTF-8"?>
-<!DOCTYPE book PUBLIC "-//OASIS//DTD DocBook XML V4.3CR3//EN"
-"?http://www.docbook.org/xsd/4.3/docbook.xsd"
+<!DOCTYPE book PUBLIC "-//OASIS//DTD DocBook XML V4.3//EN"
+"http://www.docbook.org/xsd/4.3/docbook.xsd"
[<!ENTITY jsf_struts SYSTEM "modules/jsf_struts.xml">
<!ENTITY jsf_struts_war SYSTEM "modules/jsf_struts_war.xml">
Modified: trunk/documentation/guides/GettingStartedGuide/en/master.xml
===================================================================
--- trunk/documentation/guides/GettingStartedGuide/en/master.xml 2008-07-29 15:43:49 UTC (rev 9400)
+++ trunk/documentation/guides/GettingStartedGuide/en/master.xml 2008-07-29 16:32:33 UTC (rev 9401)
@@ -1,5 +1,5 @@
<?xml version="1.0" encoding="UTF-8"?>
-<!DOCTYPE book PUBLIC "-//OASIS//DTD DocBook XML V4.3CR3//EN"
+<!DOCTYPE book PUBLIC "-//OASIS//DTD DocBook XML V4.3//EN"
"?http://www.docbook.org/xsd/4.3/docbook.xsd"
[<!ENTITY getting_started SYSTEM "modules/getting_started.xml">
Modified: trunk/documentation/jboss-tools-docs/index/en/master.xml
===================================================================
--- trunk/documentation/jboss-tools-docs/index/en/master.xml 2008-07-29 15:43:49 UTC (rev 9400)
+++ trunk/documentation/jboss-tools-docs/index/en/master.xml 2008-07-29 16:32:33 UTC (rev 9401)
@@ -1,5 +1,5 @@
<?xml version="1.0" encoding="UTF-8"?>
-<!DOCTYPE book PUBLIC "-//OASIS//DTD DocBook XML V4.3CR3//EN"
+<!DOCTYPE book PUBLIC "-//OASIS//DTD DocBook XML V4.3//EN"
"http://www.oasis-open.org/docbook/xml/4.3CR3/docbookx.dtd">
<book>
<bookinfo>
Modified: trunk/esb/docs/esb_ref_guide/en/master.xml
===================================================================
--- trunk/esb/docs/esb_ref_guide/en/master.xml 2008-07-29 15:43:49 UTC (rev 9400)
+++ trunk/esb/docs/esb_ref_guide/en/master.xml 2008-07-29 16:32:33 UTC (rev 9401)
@@ -1,5 +1,5 @@
<?xml version="1.0" encoding="UTF-8"?>
-<!DOCTYPE book PUBLIC "-//OASIS//DTD DocBook XML V4.3CR3//EN"
+<!DOCTYPE book PUBLIC "-//OASIS//DTD DocBook XML V4.3//EN"
"?http://www.docbook.org/xsd/4.3/docbook.xsd"
[
Modified: trunk/hibernatetools/docs/reference/en/master.xml
===================================================================
--- trunk/hibernatetools/docs/reference/en/master.xml 2008-07-29 15:43:49 UTC (rev 9400)
+++ trunk/hibernatetools/docs/reference/en/master.xml 2008-07-29 16:32:33 UTC (rev 9401)
@@ -1,5 +1,5 @@
<?xml version="1.0" encoding="UTF-8"?>
-<!DOCTYPE book PUBLIC "-//OASIS//DTD DocBook XML V4.3CR3//EN"
+<!DOCTYPE book PUBLIC "-//OASIS//DTD DocBook XML V4.3//EN"
"http://www.docbook.org/xsd/4.3/docbook.xsd"
[
Modified: trunk/jbpm/docs/reference/en/master.xml
===================================================================
--- trunk/jbpm/docs/reference/en/master.xml 2008-07-29 15:43:49 UTC (rev 9400)
+++ trunk/jbpm/docs/reference/en/master.xml 2008-07-29 16:32:33 UTC (rev 9401)
@@ -1,5 +1,5 @@
<?xml version="1.0" encoding="UTF-8"?>
-<!DOCTYPE book PUBLIC "-//OASIS//DTD DocBook XML V4.3CR3//EN"
+<!DOCTYPE book PUBLIC "-//OASIS//DTD DocBook XML V4.3//EN"
"?http://www.docbook.org/xsd/4.3/docbook.xsd"
Modified: trunk/jsf/docs/jsf_tools_ref_guide/en/master.xml
===================================================================
--- trunk/jsf/docs/jsf_tools_ref_guide/en/master.xml 2008-07-29 15:43:49 UTC (rev 9400)
+++ trunk/jsf/docs/jsf_tools_ref_guide/en/master.xml 2008-07-29 16:32:33 UTC (rev 9401)
@@ -1,5 +1,5 @@
<?xml version="1.0" encoding="UTF-8"?>
-<!DOCTYPE book PUBLIC "-//OASIS//DTD DocBook XML V4.3CR3//EN"
+<!DOCTYPE book PUBLIC "-//OASIS//DTD DocBook XML V4.3//EN"
"http://www.docbook.org/xsd/4.3/docbook.xsd"
[
Modified: trunk/jsf/docs/jsf_tools_tutorial/en/master.xml
===================================================================
--- trunk/jsf/docs/jsf_tools_tutorial/en/master.xml 2008-07-29 15:43:49 UTC (rev 9400)
+++ trunk/jsf/docs/jsf_tools_tutorial/en/master.xml 2008-07-29 16:32:33 UTC (rev 9401)
@@ -1,5 +1,5 @@
<?xml version="1.0" encoding="UTF-8"?>
-<!DOCTYPE book PUBLIC "-//OASIS//DTD DocBook XML V4.3CR3//EN"
+<!DOCTYPE book PUBLIC "-//OASIS//DTD DocBook XML V4.3//EN"
"http://www.docbook.org/xsd/4.3/docbook.xsd"
[<!ENTITY introduction SYSTEM "modules/introduction.xml">
Modified: trunk/jsf/docs/userguide/en/master.xml
===================================================================
--- trunk/jsf/docs/userguide/en/master.xml 2008-07-29 15:43:49 UTC (rev 9400)
+++ trunk/jsf/docs/userguide/en/master.xml 2008-07-29 16:32:33 UTC (rev 9401)
@@ -1,5 +1,5 @@
<?xml version="1.0" encoding="UTF-8"?>
-<!DOCTYPE book PUBLIC "-//OASIS//DTD DocBook XML V4.3CR3//EN"
+<!DOCTYPE book PUBLIC "-//OASIS//DTD DocBook XML V4.3//EN"
"http://www.oasis-open.org/docbook/xml/4.3CR3/docbookx.dtd"
[
Modified: trunk/seam/docs/reference/en/master.xml
===================================================================
--- trunk/seam/docs/reference/en/master.xml 2008-07-29 15:43:49 UTC (rev 9400)
+++ trunk/seam/docs/reference/en/master.xml 2008-07-29 16:32:33 UTC (rev 9401)
@@ -1,5 +1,5 @@
<?xml version="1.0" encoding="UTF-8"?>
-<!DOCTYPE book PUBLIC "-//OASIS//DTD DocBook XML V4.3CR3//EN"
+<!DOCTYPE book PUBLIC "-//OASIS//DTD DocBook XML V4.3//EN"
"http://www.docbook.org/xsd/4.3/docbook.xsd"
[<!ENTITY intro SYSTEM "modules/intro.xml">
Modified: trunk/struts/docs/struts_tools_ref_guide/en/master.xml
===================================================================
--- trunk/struts/docs/struts_tools_ref_guide/en/master.xml 2008-07-29 15:43:49 UTC (rev 9400)
+++ trunk/struts/docs/struts_tools_ref_guide/en/master.xml 2008-07-29 16:32:33 UTC (rev 9401)
@@ -1,5 +1,5 @@
<?xml version="1.0" encoding="UTF-8"?>
-<!DOCTYPE book PUBLIC "-//OASIS//DTD DocBook XML V4.3CR3//EN"
+<!DOCTYPE book PUBLIC "-//OASIS//DTD DocBook XML V4.3//EN"
"http://www.docbook.org/xsd/4.3/docbook.xsd"
[
Modified: trunk/struts/docs/struts_tools_tutorial/en/master.xml
===================================================================
--- trunk/struts/docs/struts_tools_tutorial/en/master.xml 2008-07-29 15:43:49 UTC (rev 9400)
+++ trunk/struts/docs/struts_tools_tutorial/en/master.xml 2008-07-29 16:32:33 UTC (rev 9401)
@@ -1,5 +1,5 @@
<?xml version="1.0" encoding="UTF-8"?>
-<!DOCTYPE book PUBLIC "-//OASIS//DTD DocBook XML V4.3CR3//EN"
+<!DOCTYPE book PUBLIC "-//OASIS//DTD DocBook XML V4.3//EN"
"http://www.docbook.org/xsd/4.3/docbook.xsd"
[<!ENTITY introduction SYSTEM "modules/introduction.xml">
16 years, 5 months
JBoss Tools SVN: r9400 - trunk/hibernatetools/plugins/org.hibernate.eclipse.console/src/org/hibernate/eclipse/console/wizards.
by jbosstools-commits＠lists.jboss.org
Author: vyemialyanchyk
Date: 2008-07-29 11:43:49 -0400 (Tue, 29 Jul 2008)
New Revision: 9400
Modified:
trunk/hibernatetools/plugins/org.hibernate.eclipse.console/src/org/hibernate/eclipse/console/wizards/ConsoleConfigurationWizardPage.java
Log:
https://jira.jboss.org/jira/browse/JBIDE-2585
Modified: trunk/hibernatetools/plugins/org.hibernate.eclipse.console/src/org/hibernate/eclipse/console/wizards/ConsoleConfigurationWizardPage.java
===================================================================
--- trunk/hibernatetools/plugins/org.hibernate.eclipse.console/src/org/hibernate/eclipse/console/wizards/ConsoleConfigurationWizardPage.java 2008-07-29 15:39:29 UTC (rev 9399)
+++ trunk/hibernatetools/plugins/org.hibernate.eclipse.console/src/org/hibernate/eclipse/console/wizards/ConsoleConfigurationWizardPage.java 2008-07-29 15:43:49 UTC (rev 9400)
@@ -659,7 +659,7 @@
}
private void handleProjectBrowse() {
- IJavaProject paths = DialogSelectionHelper.chooseJavaProject( getShell(), ProjectUtils.findJavaProject( propertyFileText.getText() ), HibernateConsoleMessages.ConsoleConfigurationWizardPage_select_java_project, HibernateConsoleMessages.ConsoleConfigurationWizardPage_select_java_project_to_classpath );
+ IJavaProject paths = DialogSelectionHelper.chooseJavaProject( getShell(), ProjectUtils.findJavaProject( getProjectName() ), HibernateConsoleMessages.ConsoleConfigurationWizardPage_select_java_project, HibernateConsoleMessages.ConsoleConfigurationWizardPage_select_java_project_to_classpath );
if(paths!=null) {
projectNameText.setText( paths.getProject().getName() );
} else {
16 years, 5 months
JBoss Tools SVN: r9399 - in trunk/seam/plugins/org.jboss.tools.seam.ui.pages/src/org/jboss/tools/seam/ui/pages/editor: edit and 1 other directory.
by jbosstools-commits＠lists.jboss.org
Author: dazarov
Date: 2008-07-29 11:39:29 -0400 (Tue, 29 Jul 2008)
New Revision: 9399
Modified:
trunk/seam/plugins/org.jboss.tools.seam.ui.pages/src/org/jboss/tools/seam/ui/pages/editor/ecore/pages/impl/PagesModelImpl.java
trunk/seam/plugins/org.jboss.tools.seam.ui.pages/src/org/jboss/tools/seam/ui/pages/editor/edit/ViewIDEditManager.java
Log:
https://jira.jboss.org/jira/browse/JBIDE-1189
Modified: trunk/seam/plugins/org.jboss.tools.seam.ui.pages/src/org/jboss/tools/seam/ui/pages/editor/ecore/pages/impl/PagesModelImpl.java
===================================================================
--- trunk/seam/plugins/org.jboss.tools.seam.ui.pages/src/org/jboss/tools/seam/ui/pages/editor/ecore/pages/impl/PagesModelImpl.java 2008-07-29 14:30:04 UTC (rev 9398)
+++ trunk/seam/plugins/org.jboss.tools.seam.ui.pages/src/org/jboss/tools/seam/ui/pages/editor/ecore/pages/impl/PagesModelImpl.java 2008-07-29 15:39:29 UTC (rev 9399)
@@ -294,7 +294,7 @@
String newPath = event.getModelObject().getPath();
if(diagramXML.getPath() == null) {
//FIXME Should not be, this a problem. Listener should be removed earlier
- diagramXML.getModel().removeModelTreeListener(this);
+ //diagramXML.getModel().removeModelTreeListener(this);
return;
}
@@ -337,12 +337,12 @@
XModelObject target = event.getModelObject();
if(diagramXML.getPath() == null) {
//FIXME Should not be, this a problem. Listener should be removed earlier
- diagramXML.getModel().removeModelTreeListener(this);
+ //diagramXML.getModel().removeModelTreeListener(this);
return;
}
if(!target.getPath().startsWith(diagramXML.getPath())) {
//FIXME Should not be, this a problem. Listener should be removed earlier
- diagramXML.getModel().removeModelTreeListener(this);
+ //diagramXML.getModel().removeModelTreeListener(this);
return;
}
if(event.kind() == XModelTreeEvent.CHILD_ADDED) {
Modified: trunk/seam/plugins/org.jboss.tools.seam.ui.pages/src/org/jboss/tools/seam/ui/pages/editor/edit/ViewIDEditManager.java
===================================================================
--- trunk/seam/plugins/org.jboss.tools.seam.ui.pages/src/org/jboss/tools/seam/ui/pages/editor/edit/ViewIDEditManager.java 2008-07-29 14:30:04 UTC (rev 9398)
+++ trunk/seam/plugins/org.jboss.tools.seam.ui.pages/src/org/jboss/tools/seam/ui/pages/editor/edit/ViewIDEditManager.java 2008-07-29 15:39:29 UTC (rev 9399)
@@ -10,6 +10,9 @@
******************************************************************************/
package org.jboss.tools.seam.ui.pages.editor.edit;
+import java.text.MessageFormat;
+
+import org.eclipse.core.runtime.Assert;
import org.eclipse.gef.GraphicalEditPart;
import org.eclipse.gef.editparts.ZoomListener;
import org.eclipse.gef.editparts.ZoomManager;
@@ -17,16 +20,24 @@
import org.eclipse.gef.tools.DirectEditManager;
import org.eclipse.jface.action.IAction;
import org.eclipse.jface.viewers.CellEditor;
+import org.eclipse.jface.viewers.ICellEditorValidator;
import org.eclipse.jface.viewers.TextCellEditor;
import org.eclipse.swt.SWT;
+import org.eclipse.swt.events.ModifyEvent;
import org.eclipse.swt.graphics.Font;
import org.eclipse.swt.graphics.FontData;
import org.eclipse.swt.widgets.Composite;
+import org.eclipse.swt.widgets.Control;
import org.eclipse.swt.widgets.Text;
import org.eclipse.ui.IActionBars;
import org.eclipse.ui.PlatformUI;
import org.eclipse.ui.actions.ActionFactory;
+import org.eclipse.ui.internal.Workbench;
+import org.eclipse.ui.internal.WorkbenchWindow;
import org.eclipse.ui.part.CellEditorActionHandler;
+import org.jboss.tools.common.model.XModelObject;
+import org.jboss.tools.seam.pages.xml.SeamPagesXMLMessages;
+import org.jboss.tools.seam.pages.xml.model.helpers.SeamPagesDiagramHelper;
import org.jboss.tools.seam.ui.pages.editor.ecore.pages.PagesElement;
import org.jboss.tools.seam.ui.pages.editor.figures.ExceptionFigure;
import org.jboss.tools.seam.ui.pages.editor.figures.NodeFigure;
@@ -45,8 +56,16 @@
}
};
+ private XModelObject target;
+
+ private XModelObject getTarget() {
+ return target;
+ }
+
public ViewIDEditManager(GraphicalEditPart source, CellEditorLocator locator) {
super(source, null, locator);
+ target = (XModelObject) ((PagesDiagramEditPart) source.getParent())
+ .getPagesModel().getData();
}
/**
@@ -70,13 +89,50 @@
super.bringDown();
disposeScaledFont();
-
- PagesElement element = ((PagesEditPart)getEditPart()).getElementModel();
+
+ PagesElement element = ((PagesEditPart) getEditPart())
+ .getElementModel();
element.setParent(null);
}
protected CellEditor createCellEditorOn(Composite composite) {
- return new TextCellEditor(composite, SWT.SINGLE | SWT.WRAP);
+ return new TextCellEditor(composite, SWT.SINGLE | SWT.WRAP) {
+ protected void setErrorMessage(String message) {
+ super.setErrorMessage(message);
+ ((WorkbenchWindow) Workbench.getInstance()
+ .getActiveWorkbenchWindow()).getStatusLineManager()
+ .setErrorMessage(message);
+ }
+
+ protected void editOccured(ModifyEvent e) {
+ String value = text.getText();
+ if (value == null) {
+ value = "";//$NON-NLS-1$
+ }
+ Object typedValue = value;
+ boolean oldValidState = isValueValid();
+ boolean newValidState = isCorrect(typedValue);
+ if (typedValue == null && newValidState) {
+ Assert
+ .isTrue(false,
+ "Validator isn't limiting the cell editor's type range");//$NON-NLS-1$
+ }
+ if (!newValidState) {
+ // try to insert the current value into the error message.
+ setErrorMessage(MessageFormat.format(getErrorMessage(),
+ new Object[] { value }));
+ } else {
+ setErrorMessage("");
+ }
+ valueChanged(oldValidState, newValidState);
+ }
+
+ protected Control createControl(Composite parent) {
+ Control control = super.createControl(parent);
+ setErrorMessage("");
+ return control;
+ }
+ };
}
private void disposeScaledFont() {
@@ -88,11 +144,11 @@
protected void initCellEditor() {
NodeFigure figure = (NodeFigure) getEditPart().getFigure();
- if(figure instanceof PageFigure)
- getCellEditor().setValue(((PageFigure)figure).page.getName());
- else if(figure instanceof ExceptionFigure)
- getCellEditor().setValue(((ExceptionFigure)figure).exc.getName());
-
+ if (figure instanceof PageFigure)
+ getCellEditor().setValue(((PageFigure) figure).page.getName());
+ else if (figure instanceof ExceptionFigure)
+ getCellEditor().setValue(((ExceptionFigure) figure).exc.getName());
+
ZoomManager zoomMgr = (ZoomManager) getEditPart().getViewer()
.getProperty(ZoomManager.class.toString());
if (zoomMgr != null) {
@@ -109,7 +165,7 @@
actionHandler = new CellEditorActionHandler(actionBars);
actionHandler.addCellEditor(getCellEditor());
actionBars.updateActionBars();
- // getCellEditor().setValidator(NameValidator.instance);
+ getCellEditor().setValidator(new ViewIDValidator());
}
private void restoreSavedActions(IActionBars actionBars) {
@@ -155,4 +211,46 @@
}
}
+ static String FORBIDDEN_INDICES = "\"\n\t\\:<>?|"; // * is allowed anywhere
+
+ static boolean isCorrectPath(String path) {
+ if (path == null || path.equals("/") || path.indexOf("//") >= 0)
+ return false;
+ if (path.endsWith("/") || path.indexOf("../") >= 0)
+ return false;
+ if (path.endsWith(".."))
+ return false;
+ if (path.endsWith("*"))
+ return true;
+ for (int i = 0; i < FORBIDDEN_INDICES.length(); i++) {
+ if (path.indexOf(FORBIDDEN_INDICES.charAt(i)) >= 0) {
+ return false;
+ }
+ }
+ return true;
+ }
+
+ class ViewIDValidator implements ICellEditorValidator {
+ public String isValid(Object value) {
+ if (value == null)
+ return null;
+
+ String message = "";
+ String viewID = value.toString();
+
+ if (!isCorrectPath(viewID)) {
+ message = SeamPagesXMLMessages.ATTRIBUTE_VIEW_ID_IS_NOT_CORRECT;
+ return message;
+ }
+
+ boolean doNotCreateEmptyRule = false;
+ String pp = SeamPagesDiagramHelper.toNavigationRulePathPart(viewID);
+ boolean exists = getTarget().getChildByPath(pp) != null;
+ if (doNotCreateEmptyRule && exists) {
+ message = "View exists.";
+ return message;
+ }
+ return null;
+ }
+ }
}
\ No newline at end of file
16 years, 5 months