Author: dazarov Date: 2009-08-25 11:51:18 -0400 (Tue, 25 Aug 2009) New Revision: 17253 Added: trunk/seam/plugins/org.jboss.tools.seam.core/src/org/jboss/tools/seam/internal/core/refactoring/SeamRefactorSeacher.java trunk/seam/plugins/org.jboss.tools.seam.ui/src/org/jboss/tools/seam/ui/actions/FindUsagesInELAction.java Modified: trunk/seam/plugins/org.jboss.tools.seam.ui/src/org/jboss/tools/seam/ui/SeamUIMessages.java trunk/seam/plugins/org.jboss.tools.seam.ui/src/org/jboss/tools/seam/ui/messages.properties trunk/seam/plugins/org.jboss.tools.seam.ui/src/org/jboss/tools/seam/ui/refactoring/SeamRefactorContributionFactory.java Log: https://jira.jboss.org/jira/browse/JBIDE-4771 Added: trunk/seam/plugins/org.jboss.tools.seam.core/src/org/jboss/tools/seam/internal/core/refactoring/SeamRefactorSeacher.java =================================================================== --- trunk/seam/plugins/org.jboss.tools.seam.core/src/org/jboss/tools/seam/internal/core/refactoring/SeamRefactorSeacher.java (rev 0) +++ trunk/seam/plugins/org.jboss.tools.seam.core/src/org/jboss/tools/seam/internal/core/refactoring/SeamRefactorSeacher.java 2009-08-25 15:51:18 UTC (rev 17253) @@ -0,0 +1,312 @@ +/******************************************************************************* + * Copyright (c) 2009 Red Hat, Inc. + * Distributed under license by Red Hat, Inc. All rights reserved. + * This program is made available under the terms of the + * Eclipse Public License v1.0 which accompanies this distribution, + * and is available at http://www.eclipse.org/legal/epl-v10.html + * + * Contributors: + * Red Hat, Inc. - initial API and implementation + ******************************************************************************/ +package org.jboss.tools.seam.internal.core.refactoring; + +import java.io.IOException; +import java.util.StringTokenizer; + +import org.eclipse.core.resources.IContainer; +import org.eclipse.core.resources.IFile; +import org.eclipse.core.resources.IFolder; +import org.eclipse.core.resources.IProject; +import org.eclipse.core.resources.IResource; +import org.eclipse.core.runtime.CoreException; +import org.eclipse.jdt.core.IJavaProject; +import org.eclipse.jdt.internal.ui.text.FastJavaPartitionScanner; +import org.eclipse.jdt.ui.text.IJavaPartitions; +import org.eclipse.jface.text.BadLocationException; +import org.eclipse.jface.text.Document; +import org.eclipse.jface.text.rules.IToken; +import org.eclipse.jface.text.rules.Token; +import org.eclipse.wst.sse.core.StructuredModelManager; +import org.eclipse.wst.sse.core.internal.provisional.IModelManager; +import org.eclipse.wst.sse.core.internal.provisional.IStructuredModel; +import org.eclipse.wst.sse.core.internal.provisional.text.IStructuredDocumentRegion; +import org.eclipse.wst.sse.core.internal.provisional.text.ITextRegion; +import org.eclipse.wst.sse.core.internal.provisional.text.ITextRegionList; +import org.eclipse.wst.xml.core.internal.provisional.document.IDOMDocument; +import org.eclipse.wst.xml.core.internal.provisional.document.IDOMModel; +import org.eclipse.wst.xml.core.internal.provisional.document.IDOMNode; +import org.eclipse.wst.xml.core.internal.regions.DOMRegionContext; +import org.jboss.tools.common.el.core.model.ELInstance; +import org.jboss.tools.common.el.core.model.ELInvocationExpression; +import org.jboss.tools.common.el.core.model.ELModel; +import org.jboss.tools.common.el.core.model.ELPropertyInvocation; +import org.jboss.tools.common.el.core.parser.ELParser; +import org.jboss.tools.common.el.core.parser.ELParserUtil; +import org.jboss.tools.common.model.util.EclipseResourceUtil; +import org.jboss.tools.common.util.FileUtil; +import org.jboss.tools.seam.core.SeamCorePlugin; +import org.jboss.tools.seam.core.SeamProjectsSet; +import org.w3c.dom.Node; +import org.w3c.dom.NodeList; + +public abstract class SeamRefactorSeacher { + protected static final String JAVA_EXT = "java"; //$NON-NLS-1$ + protected static final String XML_EXT = "xml"; //$NON-NLS-1$ + protected static final String XHTML_EXT = "xhtml"; //$NON-NLS-1$ + protected static final String JSP_EXT = "jsp"; //$NON-NLS-1$ + protected static final String PROPERTIES_EXT = "properties"; //$NON-NLS-1$ + + protected static final String SEAM_PROPERTIES_FILE = "seam.properties"; //$NON-NLS-1$ + + protected IFile baseFile; + protected String propertyName; + + public SeamRefactorSeacher(IFile baseFile, String propertyName){ + this.baseFile = baseFile; + this.propertyName = propertyName; + } + + public void findELReferences(){ + SeamProjectsSet projectsSet = new SeamProjectsSet(baseFile.getProject()); + + IProject[] projects = projectsSet.getAllProjects(); + for (IProject project : projects) { + if(project == null) continue; + + IJavaProject javaProject = EclipseResourceUtil.getJavaProject(project); + + // searching java, xml and property files in source folders + if(javaProject != null){ + for(IResource resource : EclipseResourceUtil.getJavaSourceRoots(project)){ + if(resource instanceof IFolder) + scanForJava((IFolder) resource); + else if(resource instanceof IFile) + scanForJava((IFile) resource); + } + } + + // searching jsp, xhtml and xml files in WebContent folders + if(project.equals(projectsSet.getWarProject())) + scan(projectsSet.getDefaultViewsFolder()); + else if(project.equals(projectsSet.getEarProject())) + scan(projectsSet.getDefaultEarViewsFolder()); + else{ + scan(project); + } + } + } + private void scanForJava(IContainer container){ + try{ + for(IResource resource : container.members()){ + if(resource instanceof IFolder) + scanForJava((IFolder) resource); + else if(resource instanceof IFile) + scanForJava((IFile) resource); + } + }catch(CoreException ex){ + SeamCorePlugin.getDefault().logError(ex); + } + } + + private void scan(IContainer container){ + try{ + for(IResource resource : container.members()){ + if(resource instanceof IFolder) + scan((IFolder) resource); + else if(resource instanceof IFile) + scan((IFile) resource); + } + }catch(CoreException ex){ + SeamCorePlugin.getDefault().logError(ex); + } + } + + private void scanForJava(IFile file){ + String ext = file.getFileExtension(); + + if(!isFileCorrect(file)) + return; + + String content = null; + try { + content = FileUtil.readStream(file.getContents()); + } catch (CoreException e) { + SeamCorePlugin.getPluginLog().logError(e); + return; + } + if(JAVA_EXT.equalsIgnoreCase(ext)){ + scanJava(file, content); + }else if(XML_EXT.equalsIgnoreCase(ext)) + scanDOM(file, content); + else if(PROPERTIES_EXT.equalsIgnoreCase(ext)) + scanProperties(file, content); + } + + private void scan(IFile file){ + String ext = file.getFileExtension(); + + if(!isFileCorrect(file)) + return; + + String content = null; + try { + content = FileUtil.readStream(file.getContents()); + } catch (CoreException e) { + SeamCorePlugin.getPluginLog().logError(e); + return; + } + if(XML_EXT.equalsIgnoreCase(ext) || XHTML_EXT.equalsIgnoreCase(ext) || JSP_EXT.equalsIgnoreCase(ext)) + scanDOM(file, content); + } + + private void scanJava(IFile file, String content){ + try { + FastJavaPartitionScanner scaner = new FastJavaPartitionScanner(); + Document document = new Document(content); + scaner.setRange(document, 0, document.getLength()); + IToken token = scaner.nextToken(); + while(token!=null && token!=Token.EOF) { + if(IJavaPartitions.JAVA_STRING.equals(token.getData())) { + int length = scaner.getTokenLength(); + int offset = scaner.getTokenOffset(); + String value = document.get(offset, length); + if(value.indexOf('{')>-1) { + scanString(file, value, offset); + } + } + token = scaner.nextToken(); + } + } catch (BadLocationException e) { + SeamCorePlugin.getDefault().logError(e); + } + } + + private void scanDOM(IFile file, String content){ + IModelManager manager = StructuredModelManager.getModelManager(); + if(manager == null) { + return; + } + IStructuredModel model = null; + try { + model = manager.getModelForRead(file); + if (model instanceof IDOMModel) { + IDOMModel domModel = (IDOMModel) model; + IDOMDocument document = domModel.getDocument(); + scanChildNodes(file, document); + } + } catch (CoreException e) { + SeamCorePlugin.getDefault().logError(e); + } catch (IOException e) { + SeamCorePlugin.getDefault().logError(e); + } finally { + if (model != null) { + model.releaseFromRead(); + } + } + } + + private void scanChildNodes(IFile file, Node parent) { + NodeList children = parent.getChildNodes(); + for(int i=0; i<children.getLength(); i++) { + Node curentValidatedNode = children.item(i); + if(Node.ELEMENT_NODE == curentValidatedNode.getNodeType()) { + scanNodeContent(file, ((IDOMNode)curentValidatedNode).getFirstStructuredDocumentRegion(), DOMRegionContext.XML_TAG_ATTRIBUTE_VALUE); + } else if(Node.TEXT_NODE == curentValidatedNode.getNodeType()) { + scanNodeContent(file, ((IDOMNode)curentValidatedNode).getFirstStructuredDocumentRegion(), DOMRegionContext.XML_CONTENT); + } + scanChildNodes(file, curentValidatedNode); + } + } + + private void scanNodeContent(IFile file, IStructuredDocumentRegion node, String regionType) { + ITextRegionList regions = node.getRegions(); + for(int i=0; i<regions.size(); i++) { + ITextRegion region = regions.get(i); + if(region.getType() == regionType) { + String text = node.getFullText(region); + if(text.indexOf("{")>-1) { //$NON-NLS-1$ + int offset = node.getStartOffset() + region.getStart(); + scanString(file, text, offset); + } + } + } + } + + // looking for component references in EL + private void scanString(IFile file, String string, int offset) { + int startEl = string.indexOf("#{"); //$NON-NLS-1$ + if(startEl>-1) { + ELParser parser = ELParserUtil.getJbossFactory().createParser(); + ELModel model = parser.parse(string); + for (ELInstance instance : model.getInstances()) { + for(ELInvocationExpression ie : instance.getExpression().getInvocations()){ + ELPropertyInvocation pi = findComponentReference(ie); + if(pi != null) + match(file, pi); + } + } + } + } + + private void scanProperties(IFile file, String content){ + scanString(file, content, 0); + + if(!file.getName().equals(SEAM_PROPERTIES_FILE)) + return; + + StringTokenizer tokenizer = new StringTokenizer(content, "#= \t\r\n\f", true); //$NON-NLS-1$ + + String lastToken = "\n"; //$NON-NLS-1$ + int offset = 0; + boolean comment = false; + boolean key = true; + + while(tokenizer.hasMoreTokens()){ + String token = tokenizer.nextToken("#= \t\r\n\f"); //$NON-NLS-1$ + if(token.equals("\r")) //$NON-NLS-1$ + token = "\n"; //$NON-NLS-1$ + + if(token.equals("#") && lastToken.equals("\n")) //$NON-NLS-1$ //$NON-NLS-2$ + comment = true; + else if(token.equals("\n") && comment) //$NON-NLS-1$ + comment = false; + + if(!comment){ + if(!token.equals("\n") && lastToken.equals("\n")) //$NON-NLS-1$ //$NON-NLS-2$ + key = true; + else if(key && (token.equals("=") || token.equals(" "))) //$NON-NLS-1$ //$NON-NLS-2$ + key = false; + + if(key && token.startsWith(propertyName)){ + match(file, token); + } + } + + lastToken = token; + offset += token.length(); + } + } + + + private ELPropertyInvocation findComponentReference(ELInvocationExpression invocationExpression){ + ELInvocationExpression invExp = invocationExpression; + while(invExp != null){ + if(invExp instanceof ELPropertyInvocation){ + if(((ELPropertyInvocation)invExp).getQualifiedName() != null && ((ELPropertyInvocation)invExp).getQualifiedName().equals(propertyName)) + return (ELPropertyInvocation)invExp; + else + invExp = invExp.getLeft(); + + }else{ + invExp = invExp.getLeft(); + } + } + return null; + } + + protected abstract boolean isFileCorrect(IFile file); + + protected abstract void match(IFile file, ELPropertyInvocation elPropertyInvokation); + + protected abstract void match(IFile file, String token); +} Property changes on: trunk/seam/plugins/org.jboss.tools.seam.core/src/org/jboss/tools/seam/internal/core/refactoring/SeamRefactorSeacher.java ___________________________________________________________________ Name: svn:mime-type + text/plain Modified: trunk/seam/plugins/org.jboss.tools.seam.ui/src/org/jboss/tools/seam/ui/SeamUIMessages.java =================================================================== --- trunk/seam/plugins/org.jboss.tools.seam.ui/src/org/jboss/tools/seam/ui/SeamUIMessages.java 2009-08-25 14:51:16 UTC (rev 17252) +++ trunk/seam/plugins/org.jboss.tools.seam.ui/src/org/jboss/tools/seam/ui/SeamUIMessages.java 2009-08-25 15:51:18 UTC (rev 17253) @@ -390,6 +390,8 @@ public static String RENAME_SEAM_CONTEXT_VARIABLE; + public static String FIND_USAGES_IN_EL; + public static String SEAM_COMPONENT_RENAME_HANDLER_ERROR; static { Added: trunk/seam/plugins/org.jboss.tools.seam.ui/src/org/jboss/tools/seam/ui/actions/FindUsagesInELAction.java =================================================================== --- trunk/seam/plugins/org.jboss.tools.seam.ui/src/org/jboss/tools/seam/ui/actions/FindUsagesInELAction.java (rev 0) +++ trunk/seam/plugins/org.jboss.tools.seam.ui/src/org/jboss/tools/seam/ui/actions/FindUsagesInELAction.java 2009-08-25 15:51:18 UTC (rev 17253) @@ -0,0 +1,103 @@ +/******************************************************************************* + * Copyright (c) 2009 Red Hat, Inc. + * Distributed under license by Red Hat, Inc. All rights reserved. + * This program is made available under the terms of the + * Eclipse Public License v1.0 which accompanies this distribution, + * and is available at http://www.eclipse.org/legal/epl-v10.html + * + * Contributors: + * Red Hat, Inc. - initial API and implementation + ******************************************************************************/ +package org.jboss.tools.seam.ui.actions; + +import org.eclipse.core.resources.IFile; +import org.eclipse.jdt.core.IMethod; +import org.eclipse.jdt.core.IType; +import org.eclipse.jface.action.Action; +import org.eclipse.jface.action.IAction; +import org.eclipse.jface.viewers.ISelection; +import org.eclipse.swt.widgets.Event; +import org.eclipse.ui.IActionDelegate2; +import org.eclipse.ui.IWorkbenchWindow; +import org.eclipse.ui.IWorkbenchWindowActionDelegate; +import org.jboss.tools.common.el.core.model.ELPropertyInvocation; +import org.jboss.tools.seam.internal.core.refactoring.SeamRefactorSeacher; +import org.jboss.tools.seam.ui.SeamUIMessages; + +public class FindUsagesInELAction extends Action implements IWorkbenchWindowActionDelegate, IActionDelegate2 { + private IFile javaFile; + private IType type; + private IMethod method; + private String propertyName; + + public FindUsagesInELAction(IFile file, IType type, IMethod method, String propertyName){ + super(SeamUIMessages.FIND_USAGES_IN_EL); + this.javaFile = file; + this.type = type; + this.method = method; + this.propertyName = propertyName; + } + + public void dispose() { + } + + public void init(IWorkbenchWindow window) { + } + + public void run(IAction action) { + //ELResolverFactoryManager.getInstance().getResolvers(resource); + + +// ELInvocationExpression expression = SeamELCompletionEngine.findExpressionAtOffset( +// document, selectionOffset, 0, document.getLength()); +// +// if (expression == null) +// return; // No EL Operand found +// +// try { +// performNewSearch(expression, file); +// } catch (JavaModelException jme) { +// SeamGuiPlugin.getPluginLog().logError(jme); +// } catch (InterruptedException ie) { +// SeamGuiPlugin.getPluginLog().logError(ie); +// } +// return; + } + + + public void selectionChanged(IAction action, ISelection selection) { + } + + public void init(IAction action) { + } + + public void runWithEvent(IAction action, Event event) { + } + + class ELSearcher extends SeamRefactorSeacher{ + public ELSearcher(IFile file, String name){ + super(file, name); + } + + @Override + protected boolean isFileCorrect(IFile file) { + // TODO Auto-generated method stub + return true; + } + + @Override + protected void match(IFile file, + ELPropertyInvocation elPropertyInvokation) { + // TODO Auto-generated method stub + + } + + @Override + protected void match(IFile file, String token) { + // TODO Auto-generated method stub + + } + + + } +} Property changes on: trunk/seam/plugins/org.jboss.tools.seam.ui/src/org/jboss/tools/seam/ui/actions/FindUsagesInELAction.java ___________________________________________________________________ Name: svn:mime-type + text/plain Modified: trunk/seam/plugins/org.jboss.tools.seam.ui/src/org/jboss/tools/seam/ui/messages.properties =================================================================== --- trunk/seam/plugins/org.jboss.tools.seam.ui/src/org/jboss/tools/seam/ui/messages.properties 2009-08-25 14:51:16 UTC (rev 17252) +++ trunk/seam/plugins/org.jboss.tools.seam.ui/src/org/jboss/tools/seam/ui/messages.properties 2009-08-25 15:51:18 UTC (rev 17253) @@ -204,4 +204,5 @@ SEAM_REFACTOR = Seam Refactor RENAME_SEAM_COMPONENT = Rename Seam Component RENAME_SEAM_CONTEXT_VARIABLE = Rename Seam Context Variable +FIND_USAGES_IN_EL = Find Usages in Expression Language SEAM_COMPONENT_RENAME_HANDLER_ERROR = Error Modified: trunk/seam/plugins/org.jboss.tools.seam.ui/src/org/jboss/tools/seam/ui/refactoring/SeamRefactorContributionFactory.java =================================================================== --- trunk/seam/plugins/org.jboss.tools.seam.ui/src/org/jboss/tools/seam/ui/refactoring/SeamRefactorContributionFactory.java 2009-08-25 14:51:16 UTC (rev 17252) +++ trunk/seam/plugins/org.jboss.tools.seam.ui/src/org/jboss/tools/seam/ui/refactoring/SeamRefactorContributionFactory.java 2009-08-25 15:51:18 UTC (rev 17253) @@ -24,6 +24,7 @@ import org.eclipse.jdt.core.ICompilationUnit; import org.eclipse.jdt.core.IJavaElement; import org.eclipse.jdt.core.IJavaProject; +import org.eclipse.jdt.core.IMethod; import org.eclipse.jdt.core.ISourceRange; import org.eclipse.jdt.core.IType; import org.eclipse.jdt.core.JavaCore; @@ -79,6 +80,7 @@ import org.jboss.tools.seam.internal.core.refactoring.RenameSeamContextVariableProcessor; import org.jboss.tools.seam.ui.SeamGuiPlugin; import org.jboss.tools.seam.ui.SeamUIMessages; +import org.jboss.tools.seam.ui.actions.FindUsagesInELAction; import org.jboss.tools.seam.ui.wizard.RenameComponentWizard; import org.jboss.tools.seam.ui.wizard.RenameSeamContextVariableWizard; import org.w3c.dom.Node; @@ -94,6 +96,9 @@ private static final String XHTML_EXT = "xhtml"; //$NON-NLS-1$ private static final String JSP_EXT = "jsp"; //$NON-NLS-1$ private static final String PROPERTIES_EXT = "properties"; //$NON-NLS-1$ + private static final String GET = "get"; //$NON-NLS-1$ + private static final String SET = "set"; //$NON-NLS-1$ + private static final String IS = "is"; //$NON-NLS-1$ static private String selectedText; static private IFile editorFile; @@ -190,6 +195,7 @@ // // additions.addContributionItem(mm, null); // } + checkPropertyName(selection, mm, additions); status = checkContextVariableInJava(editorFile, fileContent, selection); } else if(XML_EXT.equalsIgnoreCase(ext) || XHTML_EXT.equalsIgnoreCase(ext) || JSP_EXT.equalsIgnoreCase(ext)) status = checkContextVariableInDOM(editorFile, fileContent, selection); @@ -207,6 +213,28 @@ } } + private void checkPropertyName(TextSelection selection, MenuManager mm, IContributionRoot additions){ + try{ + ICompilationUnit comUnit = getCompilationUnit(editorFile); + if(comUnit != null){ + IJavaElement element = comUnit.getElementAt(selection.getOffset()); + if(element != null){ + //System.out.println("element - "+element.getClass()); + if(element instanceof IMethod){ + IMethod method = (IMethod) element; + IType type = method.getDeclaringType(); + String propertyName = getPropertyName(method); + + mm.add(new FindUsagesInELAction(editorFile, type, method, propertyName)); + additions.addContributionItem(mm, null); + } + } + } + }catch(CoreException ex){ + SeamGuiPlugin.getPluginLog().logError(ex); + } + } + private boolean checkNameAnnotation(TextSelection selection){ IAnnotation nameAnnotation = getNameAnnotation(editorFile); if(nameAnnotation != null){ @@ -398,6 +426,18 @@ return null; } + private String getPropertyName(IMethod method){ + String name = method.getElementName(); + + if(name.startsWith(GET) || name.startsWith(SET)) + return name.substring(3); + + if(name.startsWith(IS)) + return name.substring(2); + + return name; + } + private static void saveAndBuild(){ if(!SeamGuiPlugin.getDefault().getWorkbench().getActiveWorkbenchWindow().getActivePage().saveAllEditors(true)) return; @@ -462,4 +502,5 @@ invokeRenameSeamContextVariableWizard(selectedText, shell); } } + }