JBoss Tools SVN: r40090 - in trunk/documentation: movies and 3 other directories.
by jbosstools-commits＠lists.jboss.org
Author: max.andersen(a)jboss.com
Date: 2012-04-06 02:17:44 -0400 (Fri, 06 Apr 2012)
New Revision: 40090
Added:
trunk/documentation/movies/
trunk/documentation/movies/.rsyncexclude
trunk/documentation/movies/README
trunk/documentation/movies/css/
trunk/documentation/movies/css/movies.css
trunk/documentation/movies/images/
trunk/documentation/movies/images/community/
trunk/documentation/movies/images/community/bkg_gradient.gif
trunk/documentation/movies/images/community/jbosstools_horiz_450.png
trunk/documentation/movies/index.html
trunk/documentation/movies/upload.sh
Log:
uploaded new lightweight movies
Added: trunk/documentation/movies/.rsyncexclude
===================================================================
--- trunk/documentation/movies/.rsyncexclude (rev 0)
+++ trunk/documentation/movies/.rsyncexclude 2012-04-06 06:17:44 UTC (rev 40090)
@@ -0,0 +1,4 @@
+.rsyncexclude
+upload.sh
+.svn
+.project
Added: trunk/documentation/movies/README
===================================================================
--- trunk/documentation/movies/README (rev 0)
+++ trunk/documentation/movies/README 2012-04-06 06:17:44 UTC (rev 40090)
@@ -0,0 +1,6 @@
+This is a lightweight index page for http://docs.jboss.org/tools/movies/.
+
+The previous "heavyweight" content is still in http://svn.jboss.org/repos/jbosstools/documentation/trunk/movies
+
+
+
Added: trunk/documentation/movies/css/movies.css
===================================================================
--- trunk/documentation/movies/css/movies.css (rev 0)
+++ trunk/documentation/movies/css/movies.css 2012-04-06 06:17:44 UTC (rev 40090)
@@ -0,0 +1,109 @@
+
+body {
+ background-image:url(../images/community/bkg_gradient.gif);
+ background-repeat:repeat-x;
+
+ margin:0 auto;
+ padding:0;
+
+ font-family:'Lucida Grande', Geneva, Verdana, Arial, sans-serif;
+ font-size:12px;
+ max-width:55em;
+ padding:0em 2em;
+ color:#333;
+ line-height:150%;
+ text-align:justify;
+ }
+
+div.book{
+ font-family:'Lucida Grande', Geneva, Verdana, Arial, sans-serif;
+ font-size:12px;
+ margin:0;
+ padding:0em 2em;
+ color:#333;
+ line-height:150%;
+ text-align:justify;
+ width: 57em;
+ }
+
+div.chapter, #title{
+ text-align:justify;
+ width: 57em;
+}
+
+.multicolumns {
+ -moz-column-count: 2; -moz-column-gap: 20px;
+ -webkit-column-count: 2; -webkit-column-gap: 20px;
+ column-count: 2; column-gap: 20px;
+}
+
+ul.docnav {
+ margin:0px;
+ width: 57em;
+ ! height:40px;
+ display:block;
+}
+
+
+
+/* Links */
+
+a:link {color:#0066cc;}
+
+a:visited {color:#6699cc;}
+
+div.longdesc-link {
+ float:right;
+ color:#999;
+}
+
+/* Headings */
+
+h1, h2, h3, h4, h5, h6 {
+ color:#4a5d75;
+ line-height:130%;
+ margin-top:0em;
+ font-family:'Lucida Grande', Geneva, Verdana, Arial, sans-serif;
+ background-color:transparent;
+}
+
+h1 {
+ background-repeat:no-repeat;
+ border-top:1px dotted #CCCCCC;
+ line-height:1.2em;
+ color:#182737;
+ font-size:2em;
+ padding:1.5em;
+ text-align: center;
+}
+
+h2 {font-size:1.6em;}
+
+h3 {
+ font-size:1.3em;
+ padding-top:0em;
+ padding-bottom:0em;
+}
+
+h4 {
+ font-size:1.1em;
+ padding-top:0em;
+ padding-bottom:0em;
+}
+
+h5.formalpara {
+ font-size:1em;
+ margin-top:2em;
+ margin-bottom:.8em;
+}
+
+/* Element rules */
+
+hr {
+ border-collapse:collapse;
+ border-style:none;
+ border-top:1px dotted #ccc;
+ width:100% !important;
+}
+
+sup {color:#999;}
Added: trunk/documentation/movies/images/community/bkg_gradient.gif
===================================================================
(Binary files differ)
Property changes on: trunk/documentation/movies/images/community/bkg_gradient.gif
___________________________________________________________________
Added: svn:mime-type
+ application/octet-stream
Added: trunk/documentation/movies/images/community/jbosstools_horiz_450.png
===================================================================
(Binary files differ)
Property changes on: trunk/documentation/movies/images/community/jbosstools_horiz_450.png
___________________________________________________________________
Added: svn:mime-type
+ application/octet-stream
Added: trunk/documentation/movies/index.html
===================================================================
--- trunk/documentation/movies/index.html (rev 0)
+++ trunk/documentation/movies/index.html 2012-04-06 06:17:44 UTC (rev 40090)
@@ -0,0 +1,77 @@
+<html xmlns="http://www.w3.org/1999/xhtml">
+
+<head>
+
+ <link rel="stylesheet" href="css/movies.css" type="text/css"/>
+
+<script src="http://ajax.googleapis.com/ajax/libs/jquery/1.7.1/jquery.min.js"></script>
+
+
+<script type="text/javascript">
+ $(document).ready(function() {
+
+ $('.videocontrol').click(function(e) {
+ e.preventDefault(); //prevent href from actually loading
+ var href = $(this).attr('href');
+ $('#player').load(href, function() {
+ $('iframe').attr('src', href);
+ });
+
+ return;
+ });
+})
+</script>
+
+</head>
+
+<body>
+
+<div class="book">
+
+<h1><img
+ src="images/community/jbosstools_horiz_450.png"/></h1>
+ <h2 align="center">Video Tutorials</h2>
+
+<div id="player">
+ <center>
+ <iframe src="http://player.vimeo.com/video/39743315?portrait=0"
+ width="480" height="324" frameborder="0" webkitAllowFullScreen
+ mozallowfullscreen allowFullScreen></iframe>
+ </center>
+</div>
+
+<br/>
+<div id="directory">
+ <h2>Installation</h2>
+
+ <ul class="multicolumns">
+ <li class="videoListItem"><a class="videocontrol" href="http://player.vimeo.com/video/39743315?portrait=0">Eclipse Marketplace</a> </li>
+ <li class="videoListItem"> <a class="videocontrol" href="http://player.vimeo.com/video/39606090?portrait=0">Developer Studio</a></li>
+ </ul>
+
+ <h2>Technology Introductions</h2>
+
+ <ul class="multicolumns">
+ <li class="videoListItem"> <a class="videocontrol" href="http://player.vimeo.com/video/39607154?portrait=0">Java EE 6 + Arquillian</a></li>
+ <li class="videoListItem"> <a class="videocontrol" href="http://player.vimeo.com/video/39607711?portrait=0">Richfaces 4 Desktop & Mobile</a></li>
+ <li class="videoListItem"> <a class="videocontrol" href="http://player.vimeo.com/video/39608223?portrait=0">Forge</a></li>
+ <li class="videoListItem"> <a class="videocontrol" href="http://player.vimeo.com/video/39743919?portrait=0">Google Web Toolkit</a></li>
+ </ul>
+
+ <h2>Reverse Engineering/CRUD Generation</h2>
+
+ <ul class="multicolumns">
+ <li class="videoListItem"> <a class="videocontrol" href="http://player.vimeo.com/video/39608294?portrait=0">Hibernate Tools Reverse Engineering</a></li>
+ <li class="videoListItem"> <a class="videocontrol" href="http://player.vimeo.com/video/39608326?portrait=0">Forge Reverse Engineering</a></li>
+ </h2>
+
+</div>
+<div>
+
+ <br/><br/>
+<p>Looking for a different video ? Try look in our <a
+ href="../archive/movies">archive</a></p>
+ </div>
+</div>
+</body>
+</html>
\ No newline at end of file
Added: trunk/documentation/movies/upload.sh
===================================================================
--- trunk/documentation/movies/upload.sh (rev 0)
+++ trunk/documentation/movies/upload.sh 2012-04-06 06:17:44 UTC (rev 40090)
@@ -0,0 +1 @@
+rsync -i -I -c -P -C --protocol=29 --exclude-from '.rsyncexclude' --include=core -avz . tools@filemgmt.jboss.org:/docs_htdocs/tools/movies/
Property changes on: trunk/documentation/movies/upload.sh
___________________________________________________________________
Added: svn:executable
+ *
13 years, 8 months
JBoss Tools SVN: r40089 - trunk/common/plugins/org.jboss.tools.common.model/src/org/jboss/tools/common/model/filesystems/impl.
by jbosstools-commits＠lists.jboss.org
Author: scabanovich
Date: 2012-04-05 19:52:02 -0400 (Thu, 05 Apr 2012)
New Revision: 40089
Modified:
trunk/common/plugins/org.jboss.tools.common.model/src/org/jboss/tools/common/model/filesystems/impl/FileSystemsImpl.java
Log:
JBIDE-11485
https://issues.jboss.org/browse/JBIDE-11485
Avoid update if only derived resources changed.
Modified: trunk/common/plugins/org.jboss.tools.common.model/src/org/jboss/tools/common/model/filesystems/impl/FileSystemsImpl.java
===================================================================
--- trunk/common/plugins/org.jboss.tools.common.model/src/org/jboss/tools/common/model/filesystems/impl/FileSystemsImpl.java 2012-04-05 23:33:28 UTC (rev 40088)
+++ trunk/common/plugins/org.jboss.tools.common.model/src/org/jboss/tools/common/model/filesystems/impl/FileSystemsImpl.java 2012-04-05 23:52:02 UTC (rev 40089)
@@ -218,6 +218,10 @@
if(fileDeltas != null) {
boolean onlyMarkers = true;
for (IResourceDelta d: fileDeltas) {
+ IResource r = d.getResource();
+ if(r != null && r.isDerived(IResource.CHECK_ANCESTORS)) {
+ continue;
+ }
if(d.getKind() != IResourceDelta.CHANGED) {
onlyMarkers = false;
break;
13 years, 8 months
JBoss Tools SVN: r40088 - in trunk/gwt/tests: org.jboss.tools.gwt.test and 1 other directories.
by jbosstools-commits＠lists.jboss.org
Author: dgolovin
Date: 2012-04-05 19:33:28 -0400 (Thu, 05 Apr 2012)
New Revision: 40088
Added:
trunk/gwt/tests/org.jboss.tools.gwt.test/
Removed:
trunk/gwt/tests/org.jboss.tools.gwt.tests/
Modified:
trunk/gwt/tests/org.jboss.tools.gwt.test/.project
trunk/gwt/tests/org.jboss.tools.gwt.test/META-INF/MANIFEST.MF
trunk/gwt/tests/org.jboss.tools.gwt.test/pom.xml
trunk/gwt/tests/pom.xml
Log:
renamed gwt.tests to gwt.test
Modified: trunk/gwt/tests/org.jboss.tools.gwt.test/.project
===================================================================
--- trunk/gwt/tests/org.jboss.tools.gwt.tests/.project 2012-04-05 20:50:14 UTC (rev 40080)
+++ trunk/gwt/tests/org.jboss.tools.gwt.test/.project 2012-04-05 23:33:28 UTC (rev 40088)
@@ -1,6 +1,6 @@
<?xml version="1.0" encoding="UTF-8"?>
<projectDescription>
- <name>org.jboss.tools.gwt.tests</name>
+ <name>org.jboss.tools.gwt.test</name>
<comment></comment>
<projects>
</projects>
Modified: trunk/gwt/tests/org.jboss.tools.gwt.test/META-INF/MANIFEST.MF
===================================================================
--- trunk/gwt/tests/org.jboss.tools.gwt.tests/META-INF/MANIFEST.MF 2012-04-05 20:50:14 UTC (rev 40080)
+++ trunk/gwt/tests/org.jboss.tools.gwt.test/META-INF/MANIFEST.MF 2012-04-05 23:33:28 UTC (rev 40088)
@@ -1,7 +1,7 @@
Manifest-Version: 1.0
Bundle-ManifestVersion: 2
Bundle-Name: Tests for GWT integration
-Bundle-SymbolicName: org.jboss.tools.gwt.tests;singleton:=true
+Bundle-SymbolicName: org.jboss.tools.gwt.test;singleton:=true
Bundle-Version: 1.0.2.qualifier
Bundle-Vendor: JBoss by Red Hat
Bundle-RequiredExecutionEnvironment: JavaSE-1.6
Modified: trunk/gwt/tests/org.jboss.tools.gwt.test/pom.xml
===================================================================
--- trunk/gwt/tests/org.jboss.tools.gwt.tests/pom.xml 2012-04-05 20:50:14 UTC (rev 40080)
+++ trunk/gwt/tests/org.jboss.tools.gwt.test/pom.xml 2012-04-05 23:33:28 UTC (rev 40088)
@@ -8,7 +8,7 @@
<version>1.0.2-SNAPSHOT</version>
</parent>
<groupId>org.jboss.tools.gwt.tests</groupId>
- <artifactId>org.jboss.tools.gwt.tests</artifactId>
+ <artifactId>org.jboss.tools.gwt.test</artifactId>
<packaging>eclipse-test-plugin</packaging>
<build>
Modified: trunk/gwt/tests/pom.xml
===================================================================
--- trunk/gwt/tests/pom.xml 2012-04-05 23:09:24 UTC (rev 40087)
+++ trunk/gwt/tests/pom.xml 2012-04-05 23:33:28 UTC (rev 40088)
@@ -13,7 +13,7 @@
<packaging>pom</packaging>
<modules>
- <module>org.jboss.tools.gwt.tests</module>
+ <module>org.jboss.tools.gwt.test</module>
</modules>
</project>
13 years, 8 months
JBoss Tools SVN: r40087 - trunk/runtime/features/org.jboss.tools.runtime.test.feature.
by jbosstools-commits＠lists.jboss.org
Author: dgolovin
Date: 2012-04-05 19:09:24 -0400 (Thu, 05 Apr 2012)
New Revision: 40087
Modified:
trunk/runtime/features/org.jboss.tools.runtime.test.feature/feature.xml
Log:
fix for continuous build error introduced in revision
http://source.jboss.org/changelog/JBossTools?cs=40021
[ERROR] Failed to execute goal org.eclipse.tycho:tycho-p2-publisher-plugin:0.14.1:publish-products (default-publish-products) on project runtime.site: Execution default-publish-products of goal org.eclipse.tycho:tycho-p2-publisher-plugin:0.14.1:publish-products failed: "No solution found because the problem is unsatisfiable.": ["Unable to satisfy dependency from org.jboss.tools.runtime.test.feature.feature.group 1.3.0.v20120405-2228-Beta3 to org.jboss.ide.eclipse.as.core [2.3.0].", "No solution found because the problem is unsatisfiable."]
Modified: trunk/runtime/features/org.jboss.tools.runtime.test.feature/feature.xml
===================================================================
--- trunk/runtime/features/org.jboss.tools.runtime.test.feature/feature.xml 2012-04-05 22:25:25 UTC (rev 40086)
+++ trunk/runtime/features/org.jboss.tools.runtime.test.feature/feature.xml 2012-04-05 23:09:24 UTC (rev 40087)
@@ -1,24 +1,33 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<feature id="org.jboss.tools.runtime.test.feature" label="JBoss Tools - Tests - Runtime Detection" version="1.3.0.qualifier">
-
- <description>
- %description
- </description>
-
- <copyright>
- %copyright
- </copyright>
-
- <license url="%licenseURL">
- %license
- </license>
-
- <requires>
- <import feature="org.jboss.tools.runtime.core.feature" version="1.3.0" match="compatible"/>
- <import feature="org.jboss.tools.runtime.as.detector.feature" version="1.3.0" match="compatible"/>
- <import feature="org.jboss.ide.eclipse.as.serverAdapter.wtp.feature" version="2.3.0" match="compatible"/>
- <plugin id="org.jboss.ide.eclipse.as.core" version="2.3.0" match="compatible"/>
- </requires>
-
- <plugin id="org.jboss.tools.runtime.test" download-size="0" install-size="0" version="0.0.0" unpack="false" />
-</feature>
+<?xml version="1.0" encoding="UTF-8"?>
+<feature
+ id="org.jboss.tools.runtime.test.feature"
+ label="JBoss Tools - Tests - Runtime Detection"
+ version="1.3.0.qualifier">
+
+ <description>
+ %description
+ </description>
+
+ <copyright>
+ %copyright
+ </copyright>
+
+ <license url="%licenseURL">
+ %license
+ </license>
+
+ <requires>
+ <import feature="org.jboss.tools.runtime.core.feature" version="1.3.0" match="compatible"/>
+ <import feature="org.jboss.tools.runtime.as.detector.feature" version="1.3.0" match="compatible"/>
+ <import feature="org.jboss.ide.eclipse.as.serverAdapter.wtp.feature" version="2.3.0" match="compatible"/>
+ <import plugin="org.jboss.ide.eclipse.as.core"/>
+ </requires>
+
+ <plugin
+ id="org.jboss.tools.runtime.test"
+ download-size="0"
+ install-size="0"
+ version="0.0.0"
+ unpack="false"/>
+
+</feature>
13 years, 8 months
JBoss Tools SVN: r40086 - in trunk: maven/plugins/org.jboss.tools.maven.gwt and 1 other directory.
by jbosstools-commits＠lists.jboss.org
Author: dgolovin
Date: 2012-04-05 18:25:25 -0400 (Thu, 05 Apr 2012)
New Revision: 40086
Modified:
trunk/cdi/tests/org.jboss.tools.cdi.seam3.bot.test/
trunk/maven/plugins/org.jboss.tools.maven.gwt/
Log:
bin folder added to svn:ignore
Property changes on: trunk/cdi/tests/org.jboss.tools.cdi.seam3.bot.test
___________________________________________________________________
Added: svn:ignore
+ bin
Property changes on: trunk/maven/plugins/org.jboss.tools.maven.gwt
___________________________________________________________________
Added: svn:ignore
+ bin
13 years, 8 months
JBoss Tools SVN: r40085 - in trunk: cdi/tests/org.jboss.tools.cdi.test.launcher and 9 other directories.
by jbosstools-commits＠lists.jboss.org
Author: dgolovin
Date: 2012-04-05 18:22:36 -0400 (Thu, 05 Apr 2012)
New Revision: 40085
Modified:
trunk/as/plugins/org.jboss.ide.eclipse.as.dmr/
trunk/cdi/tests/org.jboss.tools.cdi.test.launcher/
trunk/central/tests/org.jboss.tools.central.test/
trunk/forge/tests/org.jboss.tools.forge.ui.bot.test/
trunk/hibernatetools/plugins/org.jboss.tools.hibernate3_6/
trunk/hibernatetools/sampleprojects/org.jboss.tools.hibernate4.sampleproject.mappingtypes/
trunk/openshift/tests/org.jboss.tools.openshift.express.test/
trunk/seam/tests/org.jboss.tools.seam221GA.core.test/
trunk/seam/tests/org.jboss.tools.seam221GA.ui.test/
trunk/seam/tests/org.jboss.tools.seam230.core.test/
trunk/seam/tests/org.jboss.tools.seam230.ui.test/
Log:
bin folder added to svn:ignore
Property changes on: trunk/as/plugins/org.jboss.ide.eclipse.as.dmr
___________________________________________________________________
Modified: svn:ignore
- target
+ target
bin
Property changes on: trunk/cdi/tests/org.jboss.tools.cdi.test.launcher
___________________________________________________________________
Added: svn:ignore
+ bin
Property changes on: trunk/central/tests/org.jboss.tools.central.test
___________________________________________________________________
Modified: svn:ignore
- target
+ target
bin
Property changes on: trunk/forge/tests/org.jboss.tools.forge.ui.bot.test
___________________________________________________________________
Added: svn:ignore
+ bin
Property changes on: trunk/hibernatetools/plugins/org.jboss.tools.hibernate3_6
___________________________________________________________________
Modified: svn:ignore
- target
+ target
bin
Property changes on: trunk/hibernatetools/sampleprojects/org.jboss.tools.hibernate4.sampleproject.mappingtypes
___________________________________________________________________
Added: svn:ignore
+ bin
Property changes on: trunk/openshift/tests/org.jboss.tools.openshift.express.test
___________________________________________________________________
Modified: svn:ignore
- target
+ target
bin
Property changes on: trunk/seam/tests/org.jboss.tools.seam221GA.core.test
___________________________________________________________________
Modified: svn:ignore
- target
+ target
bin
Property changes on: trunk/seam/tests/org.jboss.tools.seam221GA.ui.test
___________________________________________________________________
Modified: svn:ignore
- target
+ target
bin
Property changes on: trunk/seam/tests/org.jboss.tools.seam230.core.test
___________________________________________________________________
Modified: svn:ignore
- target
+ target
bin
Property changes on: trunk/seam/tests/org.jboss.tools.seam230.ui.test
___________________________________________________________________
Modified: svn:ignore
- target
+ target
bin
13 years, 8 months
JBoss Tools SVN: r40084 - trunk/jsf/plugins/org.jboss.tools.jsf/src/org/jboss/tools/jsf/web/validation.
by jbosstools-commits＠lists.jboss.org
Author: scabanovich
Date: 2012-04-05 18:10:32 -0400 (Thu, 05 Apr 2012)
New Revision: 40084
Modified:
trunk/jsf/plugins/org.jboss.tools.jsf/src/org/jboss/tools/jsf/web/validation/FacesConfigValidator.java
Log:
JBIDE-11494
https://issues.jboss.org/browse/JBIDE-11494
In validators, do not use NLS before passing message to addError, because it is considered as pattern and may cause parse errors.
Modified: trunk/jsf/plugins/org.jboss.tools.jsf/src/org/jboss/tools/jsf/web/validation/FacesConfigValidator.java
===================================================================
--- trunk/jsf/plugins/org.jboss.tools.jsf/src/org/jboss/tools/jsf/web/validation/FacesConfigValidator.java 2012-04-05 22:09:14 UTC (rev 40083)
+++ trunk/jsf/plugins/org.jboss.tools.jsf/src/org/jboss/tools/jsf/web/validation/FacesConfigValidator.java 2012-04-05 22:10:32 UTC (rev 40084)
@@ -29,7 +29,6 @@
import org.eclipse.core.runtime.Status;
import org.eclipse.jdt.core.ICompilationUnit;
import org.eclipse.jdt.core.IType;
-import org.eclipse.osgi.util.NLS;
import org.eclipse.wst.common.project.facet.core.IFacetedProject;
import org.eclipse.wst.common.project.facet.core.IProjectFacet;
import org.eclipse.wst.common.project.facet.core.ProjectFacetsManager;
@@ -444,7 +443,7 @@
return;
}
if(value != null && value.length() > 0 && !value.startsWith("*") && !value.startsWith("/")) {
- fireMessage(object, NLS.bind(JSFValidationMessage.VIEW_ID_NO_SLASH, attr));
+ fireMessage(object, JSFValidationMessage.VIEW_ID_NO_SLASH, attr);
}
}
}
@@ -461,11 +460,15 @@
return;
}
if(value.length() == 0) {
- fireMessage(object, NLS.bind(JSFValidationMessage.TO_VIEW_ID_EMPTY, attr));
- } else if(!value.startsWith("/")) {
- fireMessage(object, NLS.bind(JSFValidationMessage.VIEW_ID_NO_SLASH, attr));
+ fireMessage(object, JSFValidationMessage.TO_VIEW_ID_EMPTY, attr);
+ } else if(!value.startsWith("/")) { //$NON-NLS-1$
+ if(value.startsWith("#{")) { //$NON-NLS-1$
+ //Ignore EL.
+ return;
+ }
+ fireMessage(object, JSFValidationMessage.VIEW_ID_NO_SLASH, attr);
} else if(value.indexOf("*") >= 0) {
- fireMessage(object, NLS.bind(JSFValidationMessage.TO_VIEW_ID_STAR, attr));
+ fireMessage(object, JSFValidationMessage.TO_VIEW_ID_STAR, attr);
} else {
checkEsists(object, value);
}
@@ -475,6 +478,10 @@
if(value.indexOf('?') >= 0) {
value = value.substring(0, value.indexOf('?'));
}
+ if(value.indexOf("#{") > 0) { //$NON-NLS-1$
+ //Ignore EL.
+ return;
+ }
XModel model = object.getModel();
XModelObject o = model.getByPath(value);
if(o == null) {
@@ -508,7 +515,7 @@
} else if(checkTiles(model, value)) {
return;
}
- fireMessage(object, NLS.bind(JSFValidationMessage.VIEW_NOT_EXISTS, attr, value));
+ fireMessage(object, JSFValidationMessage.VIEW_NOT_EXISTS, attr, value);
}
private boolean checkTiles(XModel model, String path) {
@@ -558,7 +565,7 @@
if(path.length() == 0) continue;
XModelObject fc = XModelImpl.getByRelativePath(model, path);
if(fc == null) {
- fireMessage(object, NLS.bind(JSFValidationMessage.INVALID_FACES_CONFIG_REFERENCE, "param-value", path));
+ fireMessage(object, JSFValidationMessage.INVALID_FACES_CONFIG_REFERENCE, "param-value", path);
return;
}
String path2 = path.startsWith("/") ? path.substring(1) : path; //$NON-NLS-1$
@@ -568,11 +575,11 @@
if(fc2 != null) break;
}
if(fc2 == null) {
- fireMessage(object, NLS.bind(JSFValidationMessage.INVALID_FACES_CONFIG_REFERENCE, "param-value", path));
+ fireMessage(object, JSFValidationMessage.INVALID_FACES_CONFIG_REFERENCE, "param-value", path);
return;
}
if(!fc2.getModelEntity().getName().startsWith("FacesConfig")) { //$NON-NLS-1$
- fireMessage(object, NLS.bind(JSFValidationMessage.INVALID_FACES_CONFIG_REFERENCE, "param-value", path));
+ fireMessage(object, JSFValidationMessage.INVALID_FACES_CONFIG_REFERENCE, "param-value", path);
return;
}
}
13 years, 8 months
JBoss Tools SVN: r40083 - trunk/struts/plugins/org.jboss.tools.struts/src/org/jboss/tools/struts/validation.
by jbosstools-commits＠lists.jboss.org
Author: scabanovich
Date: 2012-04-05 18:09:14 -0400 (Thu, 05 Apr 2012)
New Revision: 40083
Modified:
trunk/struts/plugins/org.jboss.tools.struts/src/org/jboss/tools/struts/validation/ActionForwardCheck.java
trunk/struts/plugins/org.jboss.tools.struts/src/org/jboss/tools/struts/validation/ActionNameCheck.java
trunk/struts/plugins/org.jboss.tools.struts/src/org/jboss/tools/struts/validation/ActionRefsCheck.java
trunk/struts/plugins/org.jboss.tools.struts/src/org/jboss/tools/struts/validation/ActionTypeCheck.java
trunk/struts/plugins/org.jboss.tools.struts/src/org/jboss/tools/struts/validation/CheckInitParam.java
trunk/struts/plugins/org.jboss.tools.struts/src/org/jboss/tools/struts/validation/GlobalForwardCheck.java
trunk/struts/plugins/org.jboss.tools.struts/src/org/jboss/tools/struts/validation/ResourceCheck.java
trunk/struts/plugins/org.jboss.tools.struts/src/org/jboss/tools/struts/validation/StrutsConfigCheck.java
trunk/struts/plugins/org.jboss.tools.struts/src/org/jboss/tools/struts/validation/StrutsConfigControllerCheck.java
Log:
JBIDE-11494
https://issues.jboss.org/browse/JBIDE-11494
In validators, do not use NLS before passing message to addError, because it is considered as pattern and may cause parse errors.
Modified: trunk/struts/plugins/org.jboss.tools.struts/src/org/jboss/tools/struts/validation/ActionForwardCheck.java
===================================================================
--- trunk/struts/plugins/org.jboss.tools.struts/src/org/jboss/tools/struts/validation/ActionForwardCheck.java 2012-04-05 22:08:32 UTC (rev 40082)
+++ trunk/struts/plugins/org.jboss.tools.struts/src/org/jboss/tools/struts/validation/ActionForwardCheck.java 2012-04-05 22:09:14 UTC (rev 40083)
@@ -169,10 +169,9 @@
this.attr = attr;
String oTitle = DefaultCreateHandler.title(object, true);
String pTitle = DefaultCreateHandler.title(object.getParent(), true);
- Object[] os = (info == null) ? new Object[] {oTitle, pTitle}
- : new Object[] {oTitle, pTitle, info};
- String message = NLS.bind(id, os);
- fireMessage(object, message);
+ String[] os = (info == null) ? new String[] {oTitle, pTitle}
+ : new String[] {oTitle, pTitle, info};
+ fireMessage(object, id, os);
}
}
Modified: trunk/struts/plugins/org.jboss.tools.struts/src/org/jboss/tools/struts/validation/ActionNameCheck.java
===================================================================
--- trunk/struts/plugins/org.jboss.tools.struts/src/org/jboss/tools/struts/validation/ActionNameCheck.java 2012-04-05 22:08:32 UTC (rev 40082)
+++ trunk/struts/plugins/org.jboss.tools.struts/src/org/jboss/tools/struts/validation/ActionNameCheck.java 2012-04-05 22:09:14 UTC (rev 40083)
@@ -10,7 +10,6 @@
******************************************************************************/
package org.jboss.tools.struts.validation;
-import org.eclipse.osgi.util.NLS;
import org.jboss.tools.common.meta.action.impl.handlers.DefaultCreateHandler;
import org.jboss.tools.common.model.XModelObject;
import org.jboss.tools.common.validation.ValidationErrorManager;
@@ -32,15 +31,13 @@
if (name.length() == 0) {
String valid = (String)object.getAttributeValue("validate");
if ("yes".equals(valid) || "true".equals(valid)) {
- String message = NLS.bind(StrutsValidatorMessages.ACTION_NAME_EMPTY, new Object[] {DefaultCreateHandler.title(object, true)});
- fireMessage(object, message);
+ fireMessage(object, StrutsValidatorMessages.ACTION_NAME_EMPTY, DefaultCreateHandler.title(object, true));
}
} else {
XModelObject bean = object.getParent().getParent()
.getChildByPath("form-beans").getChildByPath(name);
if (bean == null) {
- String message = NLS.bind(StrutsValidatorMessages.ACTION_NAME_EXISTS, new Object[] {DefaultCreateHandler.title(object, true), name});
- fireMessage(object, message);
+ fireMessage(object, StrutsValidatorMessages.ACTION_NAME_EXISTS, DefaultCreateHandler.title(object, true), name);
}
}
}
Modified: trunk/struts/plugins/org.jboss.tools.struts/src/org/jboss/tools/struts/validation/ActionRefsCheck.java
===================================================================
--- trunk/struts/plugins/org.jboss.tools.struts/src/org/jboss/tools/struts/validation/ActionRefsCheck.java 2012-04-05 22:08:32 UTC (rev 40082)
+++ trunk/struts/plugins/org.jboss.tools.struts/src/org/jboss/tools/struts/validation/ActionRefsCheck.java 2012-04-05 22:09:14 UTC (rev 40083)
@@ -12,7 +12,6 @@
import java.util.*;
-import org.eclipse.osgi.util.NLS;
import org.jboss.tools.common.validation.ValidationErrorManager;
import org.jboss.tools.common.meta.action.impl.handlers.DefaultCreateHandler;
import org.jboss.tools.common.model.*;
@@ -121,9 +120,7 @@
}
protected void fire(String id, String attr, String value) {
- Object[] os = new Object[] {DefaultCreateHandler.title(object, true), value};
- String message = NLS.bind(id, os);
- fireMessage(object, message);
+ fireMessage(object, id, DefaultCreateHandler.title(object, true), value);
}
}
Modified: trunk/struts/plugins/org.jboss.tools.struts/src/org/jboss/tools/struts/validation/ActionTypeCheck.java
===================================================================
--- trunk/struts/plugins/org.jboss.tools.struts/src/org/jboss/tools/struts/validation/ActionTypeCheck.java 2012-04-05 22:08:32 UTC (rev 40082)
+++ trunk/struts/plugins/org.jboss.tools.struts/src/org/jboss/tools/struts/validation/ActionTypeCheck.java 2012-04-05 22:09:14 UTC (rev 40083)
@@ -10,7 +10,6 @@
******************************************************************************/
package org.jboss.tools.struts.validation;
-import org.eclipse.osgi.util.NLS;
import org.jboss.tools.common.meta.action.impl.handlers.DefaultCreateHandler;
import org.jboss.tools.common.model.XModelObject;
import org.jboss.tools.common.validation.ValidationErrorManager;
@@ -37,18 +36,14 @@
int tvr = tv.checkClass(object, "type", sup);
String oTitle = DefaultCreateHandler.title(object, true);
if(tvr == ValidateTypeUtil.EMPTY) {
- String message = NLS.bind(StrutsValidatorMessages.ACTION_TYPE_EMPTY, oTitle);
- fireMessage(object, message);
+ fireMessage(object, StrutsValidatorMessages.ACTION_TYPE_EMPTY, oTitle);
} else if(tvr == ValidateTypeUtil.NOT_FOUND) {
- String message = NLS.bind(StrutsValidatorMessages.ACTION_TYPE_EXISTS, new Object[] {oTitle, type});
- fireMessage(object, message);
+ fireMessage(object, StrutsValidatorMessages.ACTION_TYPE_EXISTS, oTitle, type);
} else if(tvr == ValidateTypeUtil.WRONG_SUPER) {
- String message = NLS.bind(StrutsValidatorMessages.ACTION_TYPE_EXTENDS, new Object[] {oTitle, type, sup});
- fireMessage(object, message);
+ fireMessage(object, StrutsValidatorMessages.ACTION_TYPE_EXTENDS, oTitle, type, sup);
} else if(tvr == ValidateTypeUtil.NOT_UPTODATE) {
- String message = NLS.bind(StrutsValidatorMessages.ACTION_TYPE_UPTODATE, new Object[] {oTitle, type});
- fireMessage(object, message);
- }
+ fireMessage(object, StrutsValidatorMessages.ACTION_TYPE_UPTODATE, oTitle, type);
+ }
}
}
Modified: trunk/struts/plugins/org.jboss.tools.struts/src/org/jboss/tools/struts/validation/CheckInitParam.java
===================================================================
--- trunk/struts/plugins/org.jboss.tools.struts/src/org/jboss/tools/struts/validation/CheckInitParam.java 2012-04-05 22:08:32 UTC (rev 40082)
+++ trunk/struts/plugins/org.jboss.tools.struts/src/org/jboss/tools/struts/validation/CheckInitParam.java 2012-04-05 22:09:14 UTC (rev 40083)
@@ -12,7 +12,6 @@
import java.util.StringTokenizer;
-import org.eclipse.osgi.util.NLS;
import org.jboss.tools.common.model.XModel;
import org.jboss.tools.common.model.XModelObject;
import org.jboss.tools.common.model.impl.XModelImpl;
@@ -46,17 +45,14 @@
if(path.length() == 0) continue;
XModelObject fc = XModelImpl.getByRelativePath(model, path);
if(fc == null) {
- String message = NLS.bind(StrutsValidatorMessages.RESOURCE_EXISTS, path);
- fireMessage(object, message);
+ fireMessage(object, StrutsValidatorMessages.RESOURCE_EXISTS, path);
}
String path2 = path.startsWith("/") ? path.substring(1) : path;
XModelObject fc2 = webRoot.getChildByPath(path2);
if(fc2 == null) {
- String message = NLS.bind(StrutsValidatorMessages.RESOURCE_EXISTS, path);
- fireMessage(object, message);
+ fireMessage(object, StrutsValidatorMessages.RESOURCE_EXISTS, path);
} else if(!fc2.getModelEntity().getName().startsWith("StrutsConfig")) {
- String message = NLS.bind(StrutsValidatorMessages.CONFIG_VALID, "param-value", path);
- fireMessage(object, message);
+ fireMessage(object, StrutsValidatorMessages.CONFIG_VALID, "param-value", path);
}
}
}
Modified: trunk/struts/plugins/org.jboss.tools.struts/src/org/jboss/tools/struts/validation/GlobalForwardCheck.java
===================================================================
--- trunk/struts/plugins/org.jboss.tools.struts/src/org/jboss/tools/struts/validation/GlobalForwardCheck.java 2012-04-05 22:08:32 UTC (rev 40082)
+++ trunk/struts/plugins/org.jboss.tools.struts/src/org/jboss/tools/struts/validation/GlobalForwardCheck.java 2012-04-05 22:09:14 UTC (rev 40083)
@@ -10,7 +10,6 @@
******************************************************************************/
package org.jboss.tools.struts.validation;
-import org.eclipse.osgi.util.NLS;
import org.jboss.tools.common.meta.action.impl.handlers.DefaultCreateHandler;
import org.jboss.tools.common.model.XModelObject;
import org.jboss.tools.common.validation.ValidationErrorManager;
@@ -33,9 +32,8 @@
protected void fire(String id, String attr, String info) {
this.attr = attr;
String oTitle = DefaultCreateHandler.title(object, true);
- Object[] os = (info == null) ? new Object[] {oTitle}
- : new Object[] {oTitle, info};
- String message = NLS.bind(id, os);
- fireMessage(object, message);
+ String[] os = (info == null) ? new String[] {oTitle}
+ : new String[] {oTitle, info};
+ fireMessage(object, id, os);
}
}
Modified: trunk/struts/plugins/org.jboss.tools.struts/src/org/jboss/tools/struts/validation/ResourceCheck.java
===================================================================
--- trunk/struts/plugins/org.jboss.tools.struts/src/org/jboss/tools/struts/validation/ResourceCheck.java 2012-04-05 22:08:32 UTC (rev 40082)
+++ trunk/struts/plugins/org.jboss.tools.struts/src/org/jboss/tools/struts/validation/ResourceCheck.java 2012-04-05 22:09:14 UTC (rev 40083)
@@ -10,7 +10,6 @@
******************************************************************************/
package org.jboss.tools.struts.validation;
-import org.eclipse.osgi.util.NLS;
import org.jboss.tools.common.model.XModelObject;
import org.jboss.tools.common.validation.ValidationErrorManager;
import org.jboss.tools.struts.model.handlers.OpenMessageResourcesHandler;
@@ -19,14 +18,13 @@
public ResourceCheck(ValidationErrorManager manager, String preference) {
super(manager, preference);
- attr = "parameter";
+ attr = "parameter"; //$NON-NLS-1$
}
public void check(XModelObject object) {
this.object = object;
if(!OpenMessageResourcesHandler.isReferencingResourceObject(object)) return;
if(OpenMessageResourcesHandler.getResourceObject(object) != null) return;
- String message = NLS.bind(StrutsValidatorMessages.RESOURCE_EXISTS, object.getAttributeValue("parameter"));
- fireMessage(object, message);
+ fireMessage(object, StrutsValidatorMessages.RESOURCE_EXISTS, object.getAttributeValue("parameter")); //$NON-NLS-1$
}
}
Modified: trunk/struts/plugins/org.jboss.tools.struts/src/org/jboss/tools/struts/validation/StrutsConfigCheck.java
===================================================================
--- trunk/struts/plugins/org.jboss.tools.struts/src/org/jboss/tools/struts/validation/StrutsConfigCheck.java 2012-04-05 22:08:32 UTC (rev 40082)
+++ trunk/struts/plugins/org.jboss.tools.struts/src/org/jboss/tools/struts/validation/StrutsConfigCheck.java 2012-04-05 22:09:14 UTC (rev 40083)
@@ -10,7 +10,6 @@
******************************************************************************/
package org.jboss.tools.struts.validation;
-import org.eclipse.osgi.util.NLS;
import org.jboss.tools.common.meta.action.impl.handlers.DefaultCreateHandler;
import org.jboss.tools.common.model.XModelObject;
import org.jboss.tools.common.validation.ValidationErrorManager;
@@ -28,9 +27,8 @@
AbstractWebFileImpl f = (AbstractWebFileImpl)object;
if(!f.isIncorrect()) return;
String oTitle = DefaultCreateHandler.title(object, true);
- String errors = "\n" + f.get("errors");
- String message = NLS.bind(StrutsValidatorMessages.CONFIG_VALID, oTitle, errors);
- fireMessage(object, message);
+ String errors = "\n" + f.get("errors"); //$NON-NLS-1$ //$NON-NLS-2$
+ fireMessage(object, StrutsValidatorMessages.CONFIG_VALID, oTitle, errors);
}
}
Modified: trunk/struts/plugins/org.jboss.tools.struts/src/org/jboss/tools/struts/validation/StrutsConfigControllerCheck.java
===================================================================
--- trunk/struts/plugins/org.jboss.tools.struts/src/org/jboss/tools/struts/validation/StrutsConfigControllerCheck.java 2012-04-05 22:08:32 UTC (rev 40082)
+++ trunk/struts/plugins/org.jboss.tools.struts/src/org/jboss/tools/struts/validation/StrutsConfigControllerCheck.java 2012-04-05 22:09:14 UTC (rev 40083)
@@ -10,7 +10,6 @@
******************************************************************************/
package org.jboss.tools.struts.validation;
-import org.eclipse.osgi.util.NLS;
import org.jboss.tools.common.meta.action.impl.handlers.DefaultCreateHandler;
import org.jboss.tools.common.model.XModelObject;
import org.jboss.tools.common.validation.ValidationErrorManager;
@@ -47,9 +46,7 @@
this.attr = attr;
String oTitle = DefaultCreateHandler.title(object, true);
String pTitle = DefaultCreateHandler.title(object.getParent(), true);
- Object[] os = new Object[] {oTitle, pTitle};
- String message = NLS.bind(id, os);
- fireMessage(object, message);
+ fireMessage(object, id, oTitle, pTitle);
}
}
13 years, 8 months
JBoss Tools SVN: r40082 - trunk/jst/plugins/org.jboss.tools.jst.web/src/org/jboss/tools/jst/web/validation.
by jbosstools-commits＠lists.jboss.org
Author: scabanovich
Date: 2012-04-05 18:08:32 -0400 (Thu, 05 Apr 2012)
New Revision: 40082
Modified:
trunk/jst/plugins/org.jboss.tools.jst.web/src/org/jboss/tools/jst/web/validation/Check.java
trunk/jst/plugins/org.jboss.tools.jst.web/src/org/jboss/tools/jst/web/validation/CheckClass.java
trunk/jst/plugins/org.jboss.tools.jst.web/src/org/jboss/tools/jst/web/validation/CheckFilterMappingName.java
trunk/jst/plugins/org.jboss.tools.jst.web/src/org/jboss/tools/jst/web/validation/CheckResource.java
trunk/jst/plugins/org.jboss.tools.jst.web/src/org/jboss/tools/jst/web/validation/CheckRoleReferenceName.java
trunk/jst/plugins/org.jboss.tools.jst.web/src/org/jboss/tools/jst/web/validation/CheckServletMappingName.java
trunk/jst/plugins/org.jboss.tools.jst.web/src/org/jboss/tools/jst/web/validation/messages.properties
Log:
JBIDE-11494
https://issues.jboss.org/browse/JBIDE-11494
In validators, do not use NLS before passing message to addError, because it is considered as pattern and may cause parse errors.
Modified: trunk/jst/plugins/org.jboss.tools.jst.web/src/org/jboss/tools/jst/web/validation/Check.java
===================================================================
--- trunk/jst/plugins/org.jboss.tools.jst.web/src/org/jboss/tools/jst/web/validation/Check.java 2012-04-05 22:03:59 UTC (rev 40081)
+++ trunk/jst/plugins/org.jboss.tools.jst.web/src/org/jboss/tools/jst/web/validation/Check.java 2012-04-05 22:08:32 UTC (rev 40082)
@@ -37,12 +37,19 @@
public void check(XModelObject object) {
}
+ @Deprecated
protected void fireMessage(XModelObject object, String message) {
ITextSourceReference ref = getSourceReference(object, attr);
IMarker m = manager.addError(message, preference, ref, ref.getResource());
bindMarkerToPathAndAttribute(m, object, attr);
}
+ protected void fireMessage(XModelObject object, String message, String... messageArguments) {
+ ITextSourceReference ref = getSourceReference(object, attr);
+ IMarker m = manager.addError(message, preference, messageArguments, ref, ref.getResource());
+ bindMarkerToPathAndAttribute(m, object, attr);
+ }
+
ITextSourceReference getSourceReference(XModelObject o, String attr) {
return new XMLValueInfo(o, attr);
}
Modified: trunk/jst/plugins/org.jboss.tools.jst.web/src/org/jboss/tools/jst/web/validation/CheckClass.java
===================================================================
--- trunk/jst/plugins/org.jboss.tools.jst.web/src/org/jboss/tools/jst/web/validation/CheckClass.java 2012-04-05 22:03:59 UTC (rev 40081)
+++ trunk/jst/plugins/org.jboss.tools.jst.web/src/org/jboss/tools/jst/web/validation/CheckClass.java 2012-04-05 22:08:32 UTC (rev 40082)
@@ -15,7 +15,6 @@
import org.eclipse.jdt.core.IJavaProject;
import org.eclipse.jdt.core.IType;
import org.eclipse.jdt.core.JavaModelException;
-import org.eclipse.osgi.util.NLS;
import org.jboss.tools.common.log.LogHelper;
import org.jboss.tools.common.meta.constraint.impl.XAttributeConstraintQClassName;
import org.jboss.tools.common.model.XModelObject;
@@ -180,17 +179,17 @@
}
protected void fireImplements(XModelObject object, String id, String value, String interfaceName) {
- fireMessage(object, NLS.bind(WebXMLValidatorMessages.CLASS_NOT_IMPLEMENTS, new Object[] {visualAttr, value, interfaceName}));
+ fireMessage(object, WebXMLValidatorMessages.CLASS_NOT_IMPLEMENTS, visualAttr, value, interfaceName);
}
protected void fireExtends(XModelObject object, String id, String value, String superName) {
- fireMessage(object, NLS.bind(WebXMLValidatorMessages.CLASS_NOT_EXTENDS, new Object[] {visualAttr, value, superName}));
+ fireMessage(object, WebXMLValidatorMessages.CLASS_NOT_EXTENDS, visualAttr, value, superName);
}
protected void fireInvalid(XModelObject object, String id, String value) {
- fireMessage(object, NLS.bind(WebXMLValidatorMessages.CLASS_NOT_VALID, visualAttr, value));
+ fireMessage(object, WebXMLValidatorMessages.CLASS_NOT_VALID, visualAttr, value);
}
protected void fireNotExist(XModelObject object, String id, String value) {
- fireMessage(object, NLS.bind(WebXMLValidatorMessages.CLASS_NOT_EXISTS, visualAttr, value));
+ fireMessage(object, WebXMLValidatorMessages.CLASS_NOT_EXISTS, visualAttr, value);
}
public static IType getValidType(String className, XModelObject o) {
Modified: trunk/jst/plugins/org.jboss.tools.jst.web/src/org/jboss/tools/jst/web/validation/CheckFilterMappingName.java
===================================================================
--- trunk/jst/plugins/org.jboss.tools.jst.web/src/org/jboss/tools/jst/web/validation/CheckFilterMappingName.java 2012-04-05 22:03:59 UTC (rev 40081)
+++ trunk/jst/plugins/org.jboss.tools.jst.web/src/org/jboss/tools/jst/web/validation/CheckFilterMappingName.java 2012-04-05 22:08:32 UTC (rev 40082)
@@ -10,7 +10,6 @@
******************************************************************************/
package org.jboss.tools.jst.web.validation;
-import org.eclipse.osgi.util.NLS;
import org.jboss.tools.common.model.*;
import org.jboss.tools.common.validation.ValidationErrorManager;
import org.jboss.tools.jst.web.model.helpers.WebAppHelper;
@@ -29,9 +28,9 @@
String filterName = object.getAttributeValue(ATTR);
if(filterName == null) return;
if(filterName.length() == 0) {
- fireMessage(object, NLS.bind(WebXMLValidatorMessages.EMPTY, ATTR));
+ fireMessage(object, WebXMLValidatorMessages.EMPTY, ATTR);
} else if(findFilter(object, filterName) == null) {
- fireMessage(object, NLS.bind(WebXMLValidatorMessages.FILTER_NOT_EXISTS, ATTR, filterName));
+ fireMessage(object, WebXMLValidatorMessages.FILTER_NOT_EXISTS, ATTR, filterName);
}
}
Modified: trunk/jst/plugins/org.jboss.tools.jst.web/src/org/jboss/tools/jst/web/validation/CheckResource.java
===================================================================
--- trunk/jst/plugins/org.jboss.tools.jst.web/src/org/jboss/tools/jst/web/validation/CheckResource.java 2012-04-05 22:03:59 UTC (rev 40081)
+++ trunk/jst/plugins/org.jboss.tools.jst.web/src/org/jboss/tools/jst/web/validation/CheckResource.java 2012-04-05 22:08:32 UTC (rev 40082)
@@ -13,7 +13,6 @@
import java.util.List;
import java.util.StringTokenizer;
-import org.eclipse.osgi.util.NLS;
import org.jboss.tools.common.model.XModel;
import org.jboss.tools.common.model.XModelObject;
import org.jboss.tools.common.model.filesystems.FileSystemsHelper;
@@ -112,12 +111,12 @@
}
protected void fireEmpty(XModelObject object, String id, String attr) {
- fireMessage(object, NLS.bind(WebXMLValidatorMessages.PATH_EMPTY, attr));
+ fireMessage(object, WebXMLValidatorMessages.PATH_EMPTY, attr);
}
protected void fireExists(XModelObject object, String id, String attr, String value) {
- fireMessage(object, NLS.bind(WebXMLValidatorMessages.PATH_NOT_EXISTS, attr, value));
+ fireMessage(object, WebXMLValidatorMessages.PATH_NOT_EXISTS, attr, value);
}
protected void fireExtension(XModelObject object, String id, String attr, String value) {
- fireMessage(object, NLS.bind(extensionMessage, attr, value));
+ fireMessage(object, extensionMessage, attr, value);
}
}
Modified: trunk/jst/plugins/org.jboss.tools.jst.web/src/org/jboss/tools/jst/web/validation/CheckRoleReferenceName.java
===================================================================
--- trunk/jst/plugins/org.jboss.tools.jst.web/src/org/jboss/tools/jst/web/validation/CheckRoleReferenceName.java 2012-04-05 22:03:59 UTC (rev 40081)
+++ trunk/jst/plugins/org.jboss.tools.jst.web/src/org/jboss/tools/jst/web/validation/CheckRoleReferenceName.java 2012-04-05 22:08:32 UTC (rev 40082)
@@ -10,7 +10,6 @@
******************************************************************************/
package org.jboss.tools.jst.web.validation;
-import org.eclipse.osgi.util.NLS;
import org.jboss.tools.common.model.*;
import org.jboss.tools.common.validation.ValidationErrorManager;
import org.jboss.tools.jst.web.model.helpers.WebAppHelper;
@@ -29,9 +28,9 @@
String roleName = object.getAttributeValue(attr);
if(roleName == null) return;
if(roleName.length() == 0) {
- fireMessage(object, NLS.bind(WebXMLValidatorMessages.EMPTY, attr));
+ fireMessage(object, WebXMLValidatorMessages.EMPTY, attr);
} else if(!isRoleNameOk(object, roleName)) {
- fireMessage(object, NLS.bind(WebXMLValidatorMessages.ROLE_NOT_EXISTS, attr, roleName));
+ fireMessage(object, WebXMLValidatorMessages.ROLE_NOT_EXISTS, attr, roleName);
}
}
Modified: trunk/jst/plugins/org.jboss.tools.jst.web/src/org/jboss/tools/jst/web/validation/CheckServletMappingName.java
===================================================================
--- trunk/jst/plugins/org.jboss.tools.jst.web/src/org/jboss/tools/jst/web/validation/CheckServletMappingName.java 2012-04-05 22:03:59 UTC (rev 40081)
+++ trunk/jst/plugins/org.jboss.tools.jst.web/src/org/jboss/tools/jst/web/validation/CheckServletMappingName.java 2012-04-05 22:08:32 UTC (rev 40082)
@@ -12,7 +12,6 @@
import org.eclipse.jdt.core.IType;
import org.eclipse.jdt.core.JavaModelException;
-import org.eclipse.osgi.util.NLS;
import org.jboss.tools.common.model.*;
import org.jboss.tools.common.validation.ValidationErrorManager;
import org.jboss.tools.jst.web.WebModelPlugin;
@@ -37,7 +36,7 @@
if(servletName == null) return;
if(servletName.length() == 0) {
if(acceptEmpty) return;
- fireMessage(object, NLS.bind(WebXMLValidatorMessages.EMPTY, attr));
+ fireMessage(object, WebXMLValidatorMessages.EMPTY, attr);
} else if(findServlet(object, servletName) == null) {
//JAX-RS
if(servletName.equals(JAX_RS_APPLICATION)) {
@@ -51,7 +50,7 @@
WebModelPlugin.getDefault().logError(e);
}
} else {
- fireMessage(object, NLS.bind(WebXMLValidatorMessages.SERVLET_NOT_EXISTS, attr, servletName));
+ fireMessage(object, WebXMLValidatorMessages.SERVLET_NOT_EXISTS, attr, servletName);
}
}
}
Modified: trunk/jst/plugins/org.jboss.tools.jst.web/src/org/jboss/tools/jst/web/validation/messages.properties
===================================================================
--- trunk/jst/plugins/org.jboss.tools.jst.web/src/org/jboss/tools/jst/web/validation/messages.properties 2012-04-05 22:03:59 UTC (rev 40081)
+++ trunk/jst/plugins/org.jboss.tools.jst.web/src/org/jboss/tools/jst/web/validation/messages.properties 2012-04-05 22:08:32 UTC (rev 40082)
@@ -3,15 +3,15 @@
VALIDATING_PROJECT=project "{0}"
PATH_EMPTY={0} is empty
-PATH_NOT_EXISTS={0} references to {1} that does not exist in web content
-PATH_NOT_TAGLIB={0} references to {1} that is not tag library
-PATH_NOT_ICON={0} references to {1} that is not an icon file
-PATH_NOT_PAGE={0} references to {1} that is not a page file
-CLASS_NOT_EXISTS={0} references to non-existent class {1}
-CLASS_NOT_IMPLEMENTS={0} references to {1} that does not implement interface {2}
-CLASS_NOT_EXTENDS={0} references to {1} that does not extend {2}
+PATH_NOT_EXISTS={0} references to "{1}" that does not exist in web content
+PATH_NOT_TAGLIB={0} references to "{1}" that is not tag library
+PATH_NOT_ICON={0} references to "{1}" that is not an icon file
+PATH_NOT_PAGE={0} references to "{1}" that is not a page file
+CLASS_NOT_EXISTS={0} references to non-existent class "{1}"
+CLASS_NOT_IMPLEMENTS={0} references to "{1}" that does not implement interface {2}
+CLASS_NOT_EXTENDS={0} references to "{1}" that does not extend {2}
CLASS_NOT_VALID={0} must be valid fully qualified class name
EMPTY=Attribute {0} is empty
-SERVLET_NOT_EXISTS={0} references to {1} that is not a servlet
-FILTER_NOT_EXISTS={0} references to {1} that is not a filter
-ROLE_NOT_EXISTS={0} references to {1} that is not a role
+SERVLET_NOT_EXISTS={0} references to "{1}" that is not a servlet
+FILTER_NOT_EXISTS={0} references to "{1}" that is not a filter
+ROLE_NOT_EXISTS={0} references to "{1}" that is not a role
13 years, 8 months
JBoss Tools SVN: r40081 - in trunk/jsf/tests/org.jboss.tools.jsf.test: src/org/jboss/tools/jsf/test/validation and 1 other directory.
by jbosstools-commits＠lists.jboss.org
Author: scabanovich
Date: 2012-04-05 18:03:59 -0400 (Thu, 05 Apr 2012)
New Revision: 40081
Modified:
trunk/jsf/tests/org.jboss.tools.jsf.test/projects/JSF2ComponentsValidator/WebContent/WEB-INF/faces-config.xml
trunk/jsf/tests/org.jboss.tools.jsf.test/src/org/jboss/tools/jsf/test/validation/FacesConfigValidatorTest.java
Log:
JBIDE-11494
https://issues.jboss.org/browse/JBIDE-11494
Do not validate paths that include EL.
Modified: trunk/jsf/tests/org.jboss.tools.jsf.test/projects/JSF2ComponentsValidator/WebContent/WEB-INF/faces-config.xml
===================================================================
--- trunk/jsf/tests/org.jboss.tools.jsf.test/projects/JSF2ComponentsValidator/WebContent/WEB-INF/faces-config.xml 2012-04-05 20:50:14 UTC (rev 40080)
+++ trunk/jsf/tests/org.jboss.tools.jsf.test/projects/JSF2ComponentsValidator/WebContent/WEB-INF/faces-config.xml 2012-04-05 22:03:59 UTC (rev 40081)
@@ -33,6 +33,14 @@
<from-outcome>greeting</from-outcome>
<to-view-id>pages/greeting.xhtml</to-view-id>
</navigation-case>
+ <navigation-case>
+ <from-outcome>greeting</from-outcome>
+ <to-view-id>/pages/#{aaa.bbb}</to-view-id>
+ </navigation-case>
+ <navigation-case>
+ <from-outcome>greeting</from-outcome>
+ <to-view-id>/pages/greeting3.xhtml?page=#{aaa.bbb}</to-view-id>
+ </navigation-case>
</navigation-rule>
<application>
<action-listener>actionListener</action-listener>
Modified: trunk/jsf/tests/org.jboss.tools.jsf.test/src/org/jboss/tools/jsf/test/validation/FacesConfigValidatorTest.java
===================================================================
--- trunk/jsf/tests/org.jboss.tools.jsf.test/src/org/jboss/tools/jsf/test/validation/FacesConfigValidatorTest.java 2012-04-05 20:50:14 UTC (rev 40080)
+++ trunk/jsf/tests/org.jboss.tools.jsf.test/src/org/jboss/tools/jsf/test/validation/FacesConfigValidatorTest.java 2012-04-05 22:03:59 UTC (rev 40081)
@@ -51,8 +51,9 @@
assertTrue(resource.exists());
AbstractResourceMarkerTest.assertMarkerIsCreated(resource, NLS.bind(JSFValidationMessage.VIEW_ID_NO_SLASH, JSFConstants.ATT_FROM_VIEW_ID), 23);
AbstractResourceMarkerTest.assertMarkerIsCreated(resource, NLS.bind(JSFValidationMessage.TO_VIEW_ID_STAR, JSFConstants.ATT_TO_VIEW_ID), 26);
- AbstractResourceMarkerTest.assertMarkerIsCreated(resource, NLS.bind(JSFValidationMessage.VIEW_NOT_EXISTS, JSFConstants.ATT_TO_VIEW_ID, "/pages/greeting3.xhtml"), 30);
+ AbstractResourceMarkerTest.assertMarkerIsCreated(resource, NLS.bind(JSFValidationMessage.VIEW_NOT_EXISTS, JSFConstants.ATT_TO_VIEW_ID, "/pages/greeting3.xhtml"), 30, 42);
AbstractResourceMarkerTest.assertMarkerIsCreated(resource, NLS.bind(JSFValidationMessage.VIEW_ID_NO_SLASH, JSFConstants.ATT_TO_VIEW_ID), 34);
+ AbstractResourceMarkerTest.assertMarkerIsNotCreated(resource, NLS.bind(JSFValidationMessage.VIEW_NOT_EXISTS, JSFConstants.ATT_TO_VIEW_ID, "/pages/#{aaa.bbb}"), 38);
}
}
\ No newline at end of file
13 years, 8 months