[jbosstools-commits] JBoss Tools SVN: r33371 - trunk/jst/plugins/org.jboss.tools.jst.web.verification/src/org/jboss/tools/jst/web/verification/vrules.
Author: scabanovich
Date: 2011-07-29 16:39:09 -0400 (Fri, 29 Jul 2011)
New Revision: 33371
Modified:
trunk/jst/plugins/org.jboss.tools.jst.web.verification/src/org/jboss/tools/jst/web/verification/vrules/CheckResource.java
Log:
FileSystemsHelper.getFile(object) method used.
Modified:
trunk/jst/plugins/org.jboss.tools.jst.web.verification/src/org/jboss/tools/jst/web/verification/vrules/CheckResource.java
===================================================================
---
trunk/jst/plugins/org.jboss.tools.jst.web.verification/src/org/jboss/tools/jst/web/verification/vrules/CheckResource.java 2011-07-29
20:34:41 UTC (rev 33370)
+++
trunk/jst/plugins/org.jboss.tools.jst.web.verification/src/org/jboss/tools/jst/web/verification/vrules/CheckResource.java 2011-07-29
20:39:09 UTC (rev 33371)
@@ -14,6 +14,7 @@
import java.util.StringTokenizer;
import org.jboss.tools.common.model.*;
+import org.jboss.tools.common.model.filesystems.FileSystemsHelper;
import org.jboss.tools.common.model.impl.XModelImpl;
import org.jboss.tools.common.verification.vrules.*;
import org.jboss.tools.common.verification.vrules.layer.VObjectImpl;
@@ -87,12 +88,11 @@
boolean isMappedToServlet(VObject object, String value) {
XModelObject o = ((VObjectImpl)object).getModelObject();
- while(o != null && o.getFileType() != XModelObject.FILE) o = o.getParent();
- return isMappedToServlet(o, value);
+ XModelObject webxml = FileSystemsHelper.getFile(o);
+ return webxml != null && isMappedToServlet(webxml, value);
}
boolean isMappedToServlet(XModelObject webxml, String value) {
- if(webxml == null) return false;
XModelObject[] ms = WebAppHelper.getServletMappings(webxml);
if(ms != null) for (XModelObject m: ms) {
String url = m.getAttributeValue("url-pattern"); //$NON-NLS-1$