[jbosstools-commits] JBoss Tools SVN: r25643 - in trunk/jst/plugins/org.jboss.tools.jst.web.kb/src/org/jboss/tools/jst/web/kb/internal: scanner and 1 other directory.

Friday, 8 October 2010


Author: scabanovich
Date: 2010-10-08 06:35:56 -0400 (Fri, 08 Oct 2010)
New Revision: 25643

Modified:
  
trunk/jst/plugins/org.jboss.tools.jst.web.kb/src/org/jboss/tools/jst/web/kb/internal/KbResourceVisitor.java
  
trunk/jst/plugins/org.jboss.tools.jst.web.kb/src/org/jboss/tools/jst/web/kb/internal/scanner/LibraryScanner.java
  
trunk/jst/plugins/org.jboss.tools.jst.web.kb/src/org/jboss/tools/jst/web/kb/internal/scanner/MyFacesScanner.java
  
trunk/jst/plugins/org.jboss.tools.jst.web.kb/src/org/jboss/tools/jst/web/kb/internal/scanner/XMLScanner.java
Log:
JBIDE-7291
https://jira.jboss.org/browse/JBIDE-7291

Modified:
trunk/jst/plugins/org.jboss.tools.jst.web.kb/src/org/jboss/tools/jst/web/kb/internal/KbResourceVisitor.java
===================================================================
---
trunk/jst/plugins/org.jboss.tools.jst.web.kb/src/org/jboss/tools/jst/web/kb/internal/KbResourceVisitor.java	2010-10-08
10:35:05 UTC (rev 25642)
+++
trunk/jst/plugins/org.jboss.tools.jst.web.kb/src/org/jboss/tools/jst/web/kb/internal/KbResourceVisitor.java	2010-10-08
10:35:56 UTC (rev 25643)
@@ -22,13 +22,15 @@
 import org.jboss.tools.jst.web.kb.internal.scanner.IFileScanner;
 import org.jboss.tools.jst.web.kb.internal.scanner.JSF2ResourcesScanner;
 import org.jboss.tools.jst.web.kb.internal.scanner.LoadedDeclarations;
+import org.jboss.tools.jst.web.kb.internal.scanner.MyFacesScanner;
 import org.jboss.tools.jst.web.kb.internal.scanner.ScannerException;
 import org.jboss.tools.jst.web.kb.internal.scanner.XMLScanner;
 import org.jboss.tools.jst.web.model.helpers.InnerModelHelper;
 
 public class KbResourceVisitor implements IResourceVisitor {
 	static IFileScanner[] FILE_SCANNERS = {
-		new XMLScanner(), 
+		new MyFacesScanner(),
+		new XMLScanner(),
 	};
 	JSF2ResourcesScanner jsf2scanner = new JSF2ResourcesScanner();
 	
@@ -101,6 +103,7 @@
 					long dt = System.currentTimeMillis() - t;
 //					timeUsed += dt;
 //					System.out.println("Time=" + timeUsed);
+					break;
 				}
 			}
 			if(jsf2resources != null && jsf2resources.isPrefixOf(f.getFullPath())
&& jsf2scanner.isLikelyComponentSource(f)) {

Modified:
trunk/jst/plugins/org.jboss.tools.jst.web.kb/src/org/jboss/tools/jst/web/kb/internal/scanner/LibraryScanner.java
===================================================================
---
trunk/jst/plugins/org.jboss.tools.jst.web.kb/src/org/jboss/tools/jst/web/kb/internal/scanner/LibraryScanner.java	2010-10-08
10:35:05 UTC (rev 25642)
+++
trunk/jst/plugins/org.jboss.tools.jst.web.kb/src/org/jboss/tools/jst/web/kb/internal/scanner/LibraryScanner.java	2010-10-08
10:35:56 UTC (rev 25643)
@@ -170,7 +170,7 @@
 	}
 
 	public static boolean isMyFacesMetadata(XModelObject o) {
-		if("myfaces-metadata.xml".equals(o.getPathPart())) { //$NON-NLS-1$
+		if(MyFacesScanner.METADATA_FILE_NAME.equals(o.getPathPart())) {
 			return true;
 		}
 		return false;

Modified:
trunk/jst/plugins/org.jboss.tools.jst.web.kb/src/org/jboss/tools/jst/web/kb/internal/scanner/MyFacesScanner.java
===================================================================
---
trunk/jst/plugins/org.jboss.tools.jst.web.kb/src/org/jboss/tools/jst/web/kb/internal/scanner/MyFacesScanner.java	2010-10-08
10:35:05 UTC (rev 25642)
+++
trunk/jst/plugins/org.jboss.tools.jst.web.kb/src/org/jboss/tools/jst/web/kb/internal/scanner/MyFacesScanner.java	2010-10-08
10:35:56 UTC (rev 25643)
@@ -19,10 +19,12 @@
 
 import org.eclipse.core.resources.IFile;
 import org.eclipse.core.runtime.IPath;
+import org.jboss.tools.common.model.XModel;
 import org.jboss.tools.common.model.XModelObject;
 import org.jboss.tools.common.model.filesystems.impl.FileAnyImpl;
 import org.jboss.tools.common.model.project.ext.IValueInfo;
 import org.jboss.tools.common.model.project.ext.impl.ValueInfo;
+import org.jboss.tools.common.model.util.EclipseResourceUtil;
 import org.jboss.tools.common.model.util.XModelObjectLoaderUtil;
 import org.jboss.tools.common.xml.XMLEntityResolver;
 import org.jboss.tools.common.xml.XMLUtilities;
@@ -31,6 +33,7 @@
 import org.jboss.tools.jst.web.kb.internal.taglib.myfaces.MyFacesComponent;
 import org.jboss.tools.jst.web.kb.internal.taglib.myfaces.MyFacesTagLibrary;
 import org.jboss.tools.jst.web.kb.taglib.IAttribute;
+import org.jboss.tools.jst.web.model.helpers.InnerModelHelper;
 import org.w3c.dom.Element;
 
 /**
@@ -39,6 +42,7 @@
  *
  */
 public class MyFacesScanner implements IFileScanner {
+	public static String METADATA_FILE_NAME = "myfaces-metadata.xml";
//$NON-NLS-1$
 	static String F_PREFIX = "f"; //$NON-NLS-1$
 	static String F_URI = "http://java.sun.com/jsf/core"; //$NON-NLS-1$
 
@@ -74,16 +78,19 @@
 	
 
 	public boolean isRelevant(IFile resource) {
-		return false;
+		return resource != null && resource.getName().equals(METADATA_FILE_NAME);
 	}
 
 	public boolean isLikelyComponentSource(IFile f) {
-		return false;
+		return f != null && f.getName().equals(METADATA_FILE_NAME);
 	}
 
 	public LoadedDeclarations parse(IFile f, IKbProject sp)
 			throws ScannerException {
-		return null;
+		XModel model = InnerModelHelper.createXModel(f.getProject());
+		if(model == null) return null;
+		XModelObject o = EclipseResourceUtil.getObjectByResource(model, f);
+		return parse(o, f.getFullPath(), sp);
 	}
 
 	public LoadedDeclarations parse(XModelObject o, IPath source, IKbProject sp) {
@@ -132,7 +139,7 @@
 
 	void processComponent(Element c, Map<String, MyFacesTagLibrary> libraries,
Map<String, MyFacesComponent> componentsByClass) {
 		String name = util.getAttribute(c, ATTR_NAME);
-		String className = util.getAttribute(c, "className.#text");
+		String className = util.getAttribute(c, "className.#text"); //$NON-NLS-1$
 		MyFacesComponent component = null;
 		MyFacesTagLibrary library = null;
 		boolean isNew = false;
@@ -166,11 +173,11 @@
 			component.setComponentClass(createValueInfo(className.trim()));
 			componentsByClass.put(className, component);
 		}
-		String type = util.getAttribute(c, "type.#text");
+		String type = util.getAttribute(c, "type.#text"); //$NON-NLS-1$
 		if(!isEmpty(type)) {
 			component.setComponentType(createValueInfo(type.trim()));
 		}
-		String bodyContent = util.getAttribute(c, "bodyContent.#text");
+		String bodyContent = util.getAttribute(c, "bodyContent.#text");
//$NON-NLS-1$
 		if(!isEmpty(bodyContent)) {
 			component.setCanHaveBody(createValueInfo(bodyContent.trim()));
 		}
@@ -197,7 +204,7 @@
 	}
 
 	void processAttribute(Element a, MyFacesComponent component) {
-		String name = util.getAttribute(a, "jspName.#text");
+		String name = util.getAttribute(a, "jspName.#text"); //$NON-NLS-1$
 		if(isEmpty(name)) name = util.getAttribute(a, ATTR_NAME);
 		if(isEmpty(name)) return;
 		name = name.trim();
@@ -210,7 +217,7 @@
 			isNew = true;
 		}
 		String description = util.getAttribute(a, ATTR_DESCRIPTION);
-		if(!isEmpty(description) && !description.trim().equals("no
description")) {
+		if(!isEmpty(description) && !description.trim().equals("no
description")) { //$NON-NLS-1$
 			attribute.setDescription(createValueInfo(description.trim()));
 		}
 		String required = util.getAttribute(a, ATTR_REQUIRED);

Modified:
trunk/jst/plugins/org.jboss.tools.jst.web.kb/src/org/jboss/tools/jst/web/kb/internal/scanner/XMLScanner.java
===================================================================
---
trunk/jst/plugins/org.jboss.tools.jst.web.kb/src/org/jboss/tools/jst/web/kb/internal/scanner/XMLScanner.java	2010-10-08
10:35:05 UTC (rev 25642)
+++
trunk/jst/plugins/org.jboss.tools.jst.web.kb/src/org/jboss/tools/jst/web/kb/internal/scanner/XMLScanner.java	2010-10-08
10:35:56 UTC (rev 25643)
@@ -79,11 +79,11 @@
 		XModel model = InnerModelHelper.createXModel(f.getProject());
 		if(model == null) return false;
 		XModelObject o = EclipseResourceUtil.getObjectByResource(model, f);
-		if(o == null) return false;
-		if(LibraryScanner.isTLDFile(o) 
-				|| LibraryScanner.isFaceletTaglibFile(o)
-				|| LibraryScanner.isFacesConfigFile(o)) return true;
-		return false;
+		return (o != null) &&
+			  (LibraryScanner.isTLDFile(o) 
+			|| LibraryScanner.isFaceletTaglibFile(o)
+			|| LibraryScanner.isFacesConfigFile(o)
+			);
 	}
 
 	/**


    

2024

2023

2022

2021

2020

2019

2018

2017

2016

2015

2014

2013

2012

2011

2010

2009

2008

2007

[jbosstools-commits] JBoss Tools SVN: r25643 - in trunk/jst/plugins/org.jboss.tools.jst.web.kb/src/org/jboss/tools/jst/web/kb/internal: scanner and 1 other directory.