Author: vrubezhny Date: 2009-06-11 14:44:23 -0400 (Thu, 11 Jun 2009) New Revision: 15895 Modified: trunk/seam/plugins/org.jboss.tools.seam.core/plugin.xml trunk/seam/plugins/org.jboss.tools.seam.core/src/org/jboss/tools/seam/internal/core/el/SeamELCompletionEngine.java trunk/seam/plugins/org.jboss.tools.seam.core/src/org/jboss/tools/seam/internal/core/validation/SeamELValidator.java trunk/seam/plugins/org.jboss.tools.seam.text.ext/src/org/jboss/tools/seam/text/ext/hyperlink/SeamBeanHyperlinkPartitioner.java trunk/seam/plugins/org.jboss.tools.seam.text.ext/src/org/jboss/tools/seam/text/ext/hyperlink/SeamComponentHyperlinkDetector.java trunk/seam/plugins/org.jboss.tools.seam.text.ext/src/org/jboss/tools/seam/text/ext/hyperlink/SeamELInJavaStringHyperlinkDetector.java trunk/seam/plugins/org.jboss.tools.seam.ui/src/org/jboss/tools/seam/ui/actions/SeamFindQuickAssistProcessor.java trunk/seam/plugins/org.jboss.tools.seam.ui/src/org/jboss/tools/seam/ui/search/SeamSearchEngine.java trunk/seam/plugins/org.jboss.tools.seam.ui/src/org/jboss/tools/seam/ui/search/SeamSearchQuery.java trunk/seam/plugins/org.jboss.tools.seam.ui/src/org/jboss/tools/seam/ui/search/SeamSearchVisitor.java trunk/seam/plugins/org.jboss.tools.seam.ui/src/org/jboss/tools/seam/ui/text/java/SeamELProposalProcessor.java trunk/seam/plugins/org.jboss.tools.seam.ui/src/org/jboss/tools/seam/ui/views/properties/SeamELAttributeContentProposalProvider.java Log: JBIDE-2808: Improve/refactor org.jboss.tools.common.kb plugin. SeamELCompletionEngine is re-developed to use the only default constructor in order to allow to create its instance by ELResolver factory Modified: trunk/seam/plugins/org.jboss.tools.seam.core/plugin.xml =================================================================== --- trunk/seam/plugins/org.jboss.tools.seam.core/plugin.xml 2009-06-11 18:39:49 UTC (rev 15894) +++ trunk/seam/plugins/org.jboss.tools.seam.core/plugin.xml 2009-06-11 18:44:23 UTC (rev 15895) @@ -496,7 +496,8 @@ <extension point="org.jboss.tools.common.el.core.elResolver"> <el-resolver id="seamELResolver"> - <project-nature id="org.jboss.tools.seam.core.seamnature"/> + <project-nature id="org.jboss.tools.seam.core.seamnature" + resolver-class="org.jboss.tools.seam.internal.core.el.SeamELCompletionEngine"/> </el-resolver> </extension> </plugin> Modified: trunk/seam/plugins/org.jboss.tools.seam.core/src/org/jboss/tools/seam/internal/core/el/SeamELCompletionEngine.java =================================================================== --- trunk/seam/plugins/org.jboss.tools.seam.core/src/org/jboss/tools/seam/internal/core/el/SeamELCompletionEngine.java 2009-06-11 18:39:49 UTC (rev 15894) +++ trunk/seam/plugins/org.jboss.tools.seam.core/src/org/jboss/tools/seam/internal/core/el/SeamELCompletionEngine.java 2009-06-11 18:44:23 UTC (rev 15895) @@ -28,6 +28,7 @@ import org.eclipse.jdt.core.IMethod; import org.eclipse.jdt.core.IType; import org.eclipse.jdt.core.JavaModelException; +import org.eclipse.jdt.launching.ExecutionArguments; import org.eclipse.jface.text.BadLocationException; import org.eclipse.jface.text.IDocument; import org.eclipse.jface.text.IRegion; @@ -85,14 +86,13 @@ private static final Image SEAM_MESSAGES_PROPOSAL_IMAGE = SeamCorePlugin.getDefault().getImage(SeamCorePlugin.CA_SEAM_MESSAGES_IMAGE_PATH); - ISeamProject project; private static ELParserFactory factory = ELParserUtil.getJbossFactory(); /** * Constructs SeamELCompletionEngine object */ - public SeamELCompletionEngine(ISeamProject project) { - this.project = project; + public SeamELCompletionEngine() { + } /* @@ -288,7 +288,7 @@ public ELExpression parseOperand(String operand) { if(operand == null) return null; - String el = (operand.indexOf("#{") < 0) ? "#{" + operand + "}" : operand; + String el = (operand.indexOf("#{") < 0 && operand.indexOf("${") < 0) ? "#{" + operand + "}" : operand; ELParser p = factory.createParser(); ELModel model = p.parse(el); List<ELInstance> is = model.getInstances(); @@ -345,11 +345,11 @@ ScopeType scope = getScope(project, file); if (expr.getLeft() == null && isIncomplete) { - resolvedVariables = resolveVariables(scope, expr, true, true); + resolvedVariables = resolveVariables(project, scope, expr, true, true); } else { while (left != null) { List<ISeamContextVariable> resolvedVars = new ArrayList<ISeamContextVariable>(); - resolvedVars = resolveVariables(scope, left, + resolvedVars = resolveVariables(project, scope, left, left == expr, true); if (resolvedVars != null && !resolvedVars.isEmpty()) { resolvedVariables = resolvedVars; @@ -369,27 +369,36 @@ public SeamELOperandResolveStatus resolveELOperand(IFile file, ELExpression operand, boolean returnEqualedVariablesOnly, boolean varIsUsed) throws BadLocationException, StringIndexOutOfBoundsException { - if(!(operand instanceof ELInvocationExpression)) { + if(!(operand instanceof ELInvocationExpression) || file == null) { return new SeamELOperandResolveStatus(null); } + ELInvocationExpression expr = (ELInvocationExpression)operand; boolean isIncomplete = expr.getType() == ELObjectType.EL_PROPERTY_INVOCATION && ((ELPropertyInvocation)expr).getName() == null; - + boolean isArgument = expr.getType() == ELObjectType.EL_ARGUMENT_INVOCATION; + SeamELOperandResolveStatus status = new SeamELOperandResolveStatus(expr); ELInvocationExpression left = expr; List<ISeamContextVariable> resolvedVariables = new ArrayList<ISeamContextVariable>(); + ISeamProject project = SeamCorePlugin.getSeamProject(file.getProject(), false); ScopeType scope = getScope(project, file); - if (expr.getLeft() == null && isIncomplete) { - resolvedVariables = resolveVariables(scope, expr, true, + if (expr.getLeft() != null && isArgument) { + left = expr.getLeft(); + resolvedVariables = resolveVariables(project, scope, left, false, + true); // is Final and equal names are because of + // we have no more to resolve the parts of expression, + // but we have to resolve arguments of probably a message component + } else if (expr.getLeft() == null && isIncomplete) { + resolvedVariables = resolveVariables(project, scope, expr, true, returnEqualedVariablesOnly); } else { while(left != null) { List<ISeamContextVariable>resolvedVars = new ArrayList<ISeamContextVariable>(); - resolvedVars = resolveVariables(scope, + resolvedVars = resolveVariables(project, scope, left, left == expr, returnEqualedVariablesOnly); if (resolvedVars != null && !resolvedVars.isEmpty()) { @@ -412,7 +421,7 @@ isIncomplete) { // no vars are resolved // the tokens are the part of var name ended with a separator (.) - resolvedVariables = resolveVariables(scope, expr, true, returnEqualedVariablesOnly); + resolvedVariables = resolveVariables(project, scope, expr, true, returnEqualedVariablesOnly); Set<TextProposal> proposals = new TreeSet<TextProposal>(TextProposal.KB_PROPOSAL_ORDER); for (ISeamContextVariable var : resolvedVariables) { String varName = var.getName(); @@ -722,14 +731,19 @@ } String filter = expr.getMemberName(); - if(filter == null) filter = ""; - if((filter.startsWith("'") || filter.startsWith("\"")) - && (filter.endsWith("'") || filter.endsWith("\""))) { - filter = filter.substring(1, filter.length() - 1); + boolean bSurroundWithQuotes = false; + if(filter == null) { + filter = ""; + bSurroundWithQuotes = true; } else { - //Value is set as expression itself, we cannot compute it - if(isMessages) status.setMapOrCollectionOrBundleAmoungTheTokens(); - return; + if((filter.startsWith("'") || filter.startsWith("\"")) + && (filter.endsWith("'") || filter.endsWith("\""))) { + filter = filter.substring(1, filter.length() - 1); + } else { + //Value is set as expression itself, we cannot compute it + if(isMessages) status.setMapOrCollectionOrBundleAmoungTheTokens(); + return; + } } for (TypeInfoCollector.MemberPresentation proposal : proposalsToFilter) { @@ -760,7 +774,13 @@ } else if (proposal.getPresentation().startsWith(filter)) { // This is used for CA. TextProposal kbProposal = new TextProposal(); - kbProposal.setReplacementString(proposal.getPresentation().substring(filter.length())); + + String replacementString = proposal.getPresentation().substring(filter.length()); + if (bSurroundWithQuotes) { + replacementString = "'" + replacementString + "']"; + } + + kbProposal.setReplacementString(replacementString); kbProposal.setImage(SEAM_EL_PROPOSAL_IMAGE); kbProposals.add(kbProposal); @@ -828,9 +848,17 @@ return null; } - public List<ISeamContextVariable> resolveVariables(ScopeType scope, ELInvocationExpression expr, boolean isFinal, boolean onlyEqualNames) { + + + + public List<ISeamContextVariable> resolveVariables(ISeamProject project, ScopeType scope, ELInvocationExpression expr, boolean isFinal, boolean onlyEqualNames) { List<ISeamContextVariable>resolvedVars = new ArrayList<ISeamContextVariable>(); + + if (project == null) + return new ArrayList<ISeamContextVariable>(); + String varName = expr.toString(); + if (varName != null) { resolvedVars = SeamExpressionResolver.resolveVariables(project, scope, varName, onlyEqualNames); } @@ -851,7 +879,7 @@ } else if(varName != null && (varName.startsWith("\"") || varName.startsWith("'")) && (varName.endsWith("\"") || varName.endsWith("'"))) { - IJavaProject jp = EclipseResourceUtil.getJavaProject(this.project.getProject()); + IJavaProject jp = EclipseResourceUtil.getJavaProject(project.getProject()); try { IType type = jp.findType("java.lang.String"); if(type != null) { Modified: trunk/seam/plugins/org.jboss.tools.seam.core/src/org/jboss/tools/seam/internal/core/validation/SeamELValidator.java =================================================================== --- trunk/seam/plugins/org.jboss.tools.seam.core/src/org/jboss/tools/seam/internal/core/validation/SeamELValidator.java 2009-06-11 18:39:49 UTC (rev 15894) +++ trunk/seam/plugins/org.jboss.tools.seam.core/src/org/jboss/tools/seam/internal/core/validation/SeamELValidator.java 2009-06-11 18:44:23 UTC (rev 15895) @@ -97,7 +97,7 @@ SeamContextValidationHelper coreHelper, IReporter reporter, SeamValidationContext validationContext, ISeamProject project) { super(validatorManager, coreHelper, reporter, validationContext, project); - engine = new SeamELCompletionEngine(project); + engine = new SeamELCompletionEngine(); elVarSearcher = new ElVarSearcher(engine); } Modified: trunk/seam/plugins/org.jboss.tools.seam.text.ext/src/org/jboss/tools/seam/text/ext/hyperlink/SeamBeanHyperlinkPartitioner.java =================================================================== --- trunk/seam/plugins/org.jboss.tools.seam.text.ext/src/org/jboss/tools/seam/text/ext/hyperlink/SeamBeanHyperlinkPartitioner.java 2009-06-11 18:39:49 UTC (rev 15894) +++ trunk/seam/plugins/org.jboss.tools.seam.text.ext/src/org/jboss/tools/seam/text/ext/hyperlink/SeamBeanHyperlinkPartitioner.java 2009-06-11 18:44:23 UTC (rev 15895) @@ -238,7 +238,7 @@ } //TODO do we have and need seam project here? - SeamELCompletionEngine engine = new SeamELCompletionEngine(null); + SeamELCompletionEngine engine = new SeamELCompletionEngine(); ELInvocationExpression tokens = engine.findExpressionAtOffset(document, offset, start, end); if (tokens == null /*|| tokens.size() == 0*/) return null; // No EL Operand found @@ -304,7 +304,7 @@ if (seamProject == null) return null; - SeamELCompletionEngine engine = new SeamELCompletionEngine(seamProject); + SeamELCompletionEngine engine = new SeamELCompletionEngine(); String prefix = propText; ELExpression expr = engine.parseOperand(prefix); @@ -391,7 +391,7 @@ if (seamProject == null) return null; - SeamELCompletionEngine engine= new SeamELCompletionEngine(seamProject); + SeamELCompletionEngine engine= new SeamELCompletionEngine(); String prefix = propText; ELExpression exp = engine.parseOperand(prefix); @@ -427,7 +427,7 @@ if (expr.getLeft() != null) { while (left != null) { List<ISeamContextVariable> resolvedVars = new ArrayList<ISeamContextVariable>(); - resolvedVars = engine.resolveVariables(scope, left, + resolvedVars = engine.resolveVariables(seamProject, scope, left, left == expr, true); if (resolvedVars != null && !resolvedVars.isEmpty()) { map.put(left, resolvedVars); @@ -482,7 +482,7 @@ if (seamProject == null) return null; - SeamELCompletionEngine engine= new SeamELCompletionEngine(seamProject); + SeamELCompletionEngine engine= new SeamELCompletionEngine(); String prefix = propText; ELExpression exp = engine.parseOperand(prefix); Modified: trunk/seam/plugins/org.jboss.tools.seam.text.ext/src/org/jboss/tools/seam/text/ext/hyperlink/SeamComponentHyperlinkDetector.java =================================================================== --- trunk/seam/plugins/org.jboss.tools.seam.text.ext/src/org/jboss/tools/seam/text/ext/hyperlink/SeamComponentHyperlinkDetector.java 2009-06-11 18:39:49 UTC (rev 15894) +++ trunk/seam/plugins/org.jboss.tools.seam.text.ext/src/org/jboss/tools/seam/text/ext/hyperlink/SeamComponentHyperlinkDetector.java 2009-06-11 18:44:23 UTC (rev 15895) @@ -86,7 +86,7 @@ return null; ISeamProject seamProject = SeamCorePlugin.getSeamProject(input.getResource().getProject(), true); - SeamELCompletionEngine engine = new SeamELCompletionEngine(seamProject); + SeamELCompletionEngine engine = new SeamELCompletionEngine(); IDocument document= textEditor.getDocumentProvider().getDocument(textEditor.getEditorInput()); IRegion wordRegion= JavaWordFinder.findWord(document, offset); Modified: trunk/seam/plugins/org.jboss.tools.seam.text.ext/src/org/jboss/tools/seam/text/ext/hyperlink/SeamELInJavaStringHyperlinkDetector.java =================================================================== --- trunk/seam/plugins/org.jboss.tools.seam.text.ext/src/org/jboss/tools/seam/text/ext/hyperlink/SeamELInJavaStringHyperlinkDetector.java 2009-06-11 18:39:49 UTC (rev 15894) +++ trunk/seam/plugins/org.jboss.tools.seam.text.ext/src/org/jboss/tools/seam/text/ext/hyperlink/SeamELInJavaStringHyperlinkDetector.java 2009-06-11 18:44:23 UTC (rev 15895) @@ -116,7 +116,7 @@ if (seamProject == null) return null; - SeamELCompletionEngine engine = new SeamELCompletionEngine(seamProject); + SeamELCompletionEngine engine = new SeamELCompletionEngine(); String prefix= engine.getJavaElementExpression(document, region.getOffset(), region, start, end); prefix = (prefix == null ? "" : prefix); @@ -142,7 +142,7 @@ if (seamProject == null) return null; - SeamELCompletionEngine engine = new SeamELCompletionEngine(seamProject); + SeamELCompletionEngine engine = new SeamELCompletionEngine(); String prefix= engine.getJavaElementExpression(document, region.getOffset(), region, start, end); prefix = (prefix == null ? "" : prefix); @@ -181,7 +181,7 @@ if (expr.getLeft() != null) { while (left != null) { List<ISeamContextVariable> resolvedVars = new ArrayList<ISeamContextVariable>(); - resolvedVars = engine.resolveVariables(scope, left, + resolvedVars = engine.resolveVariables(seamProject, scope, left, left == expr, true); if (resolvedVars != null && !resolvedVars.isEmpty()) { map.put(left, resolvedVars); Modified: trunk/seam/plugins/org.jboss.tools.seam.ui/src/org/jboss/tools/seam/ui/actions/SeamFindQuickAssistProcessor.java =================================================================== --- trunk/seam/plugins/org.jboss.tools.seam.ui/src/org/jboss/tools/seam/ui/actions/SeamFindQuickAssistProcessor.java 2009-06-11 18:39:49 UTC (rev 15894) +++ trunk/seam/plugins/org.jboss.tools.seam.ui/src/org/jboss/tools/seam/ui/actions/SeamFindQuickAssistProcessor.java 2009-06-11 18:44:23 UTC (rev 15895) @@ -92,7 +92,7 @@ private String[] getVariableNames(ISeamProject seamProject, IDocument document, int offset, int start, int end) { - SeamELCompletionEngine engine = new SeamELCompletionEngine(seamProject); + SeamELCompletionEngine engine = new SeamELCompletionEngine(); ELInvocationExpression tokens = engine.findExpressionAtOffset( document, offset, start, end); @@ -121,9 +121,7 @@ if (seamProject == null) return result; - SeamELCompletionEngine engine = new SeamELCompletionEngine(seamProject); - - ELInvocationExpression tokens = engine.findExpressionAtOffset( + ELInvocationExpression tokens = SeamELCompletionEngine.findExpressionAtOffset( document, context.getSelectionOffset(), 0, //TODO compute region start Modified: trunk/seam/plugins/org.jboss.tools.seam.ui/src/org/jboss/tools/seam/ui/search/SeamSearchEngine.java =================================================================== --- trunk/seam/plugins/org.jboss.tools.seam.ui/src/org/jboss/tools/seam/ui/search/SeamSearchEngine.java 2009-06-11 18:39:49 UTC (rev 15894) +++ trunk/seam/plugins/org.jboss.tools.seam.ui/src/org/jboss/tools/seam/ui/search/SeamSearchEngine.java 2009-06-11 18:44:23 UTC (rev 15895) @@ -96,7 +96,7 @@ if (seamProject == null) return Status.OK_STATUS; - SeamELCompletionEngine engine = new SeamELCompletionEngine(seamProject); + SeamELCompletionEngine engine = new SeamELCompletionEngine(); //Find Seam variable names Modified: trunk/seam/plugins/org.jboss.tools.seam.ui/src/org/jboss/tools/seam/ui/search/SeamSearchQuery.java =================================================================== --- trunk/seam/plugins/org.jboss.tools.seam.ui/src/org/jboss/tools/seam/ui/search/SeamSearchQuery.java 2009-06-11 18:39:49 UTC (rev 15894) +++ trunk/seam/plugins/org.jboss.tools.seam.ui/src/org/jboss/tools/seam/ui/search/SeamSearchQuery.java 2009-06-11 18:44:23 UTC (rev 15895) @@ -269,7 +269,7 @@ if (seamProject == null) return Status.OK_STATUS; - SeamELCompletionEngine engine = new SeamELCompletionEngine(seamProject); + SeamELCompletionEngine engine = new SeamELCompletionEngine(); // List<IJavaElement> elements = engine.getJavaElementsForELOperandTokens(seamProject, fSourceFile, fTokens) SeamSearchResultCollector collector= new SeamSearchResultCollector(textResult, getParentRequestor()); @@ -285,7 +285,7 @@ if (seamProject == null) return Status.OK_STATUS; - SeamELCompletionEngine engine = new SeamELCompletionEngine(seamProject); + SeamELCompletionEngine engine = new SeamELCompletionEngine(); SeamSearchResultCollector collector= new SeamSearchResultCollector(textResult, getParentRequestor()); return SeamSearchEngine.getInstance().search(fScope, collector, fSourceFile, fJavaElements, monitor); Modified: trunk/seam/plugins/org.jboss.tools.seam.ui/src/org/jboss/tools/seam/ui/search/SeamSearchVisitor.java =================================================================== --- trunk/seam/plugins/org.jboss.tools.seam.ui/src/org/jboss/tools/seam/ui/search/SeamSearchVisitor.java 2009-06-11 18:39:49 UTC (rev 15894) +++ trunk/seam/plugins/org.jboss.tools.seam.ui/src/org/jboss/tools/seam/ui/search/SeamSearchVisitor.java 2009-06-11 18:44:23 UTC (rev 15895) @@ -476,7 +476,7 @@ } - SeamELCompletionEngine fCompletionEngine = new SeamELCompletionEngine(project); + SeamELCompletionEngine fCompletionEngine = new SeamELCompletionEngine(); fELVarSearcher = new ElVarSearcher(fCompletionEngine); fDocumentsInEditors= evalNonFileBufferDocuments(); boolean res= true; @@ -716,7 +716,7 @@ ELInvocationExpression expr = token; while(expr != null) { List<IJavaElement> elements = null; - SeamELCompletionEngine fCompletionEngine = new SeamELCompletionEngine(fCurrentSeamProject); + SeamELCompletionEngine fCompletionEngine = new SeamELCompletionEngine(); try { elements = fCompletionEngine.getJavaElementsForELOperandTokens(fCurrentSeamProject, file, expr); } catch (StringIndexOutOfBoundsException e) { Modified: trunk/seam/plugins/org.jboss.tools.seam.ui/src/org/jboss/tools/seam/ui/text/java/SeamELProposalProcessor.java =================================================================== --- trunk/seam/plugins/org.jboss.tools.seam.ui/src/org/jboss/tools/seam/ui/text/java/SeamELProposalProcessor.java 2009-06-11 18:39:49 UTC (rev 15894) +++ trunk/seam/plugins/org.jboss.tools.seam.ui/src/org/jboss/tools/seam/ui/text/java/SeamELProposalProcessor.java 2009-06-11 18:44:23 UTC (rev 15895) @@ -374,7 +374,7 @@ //TODO Now this will work only for EL. // If we need CA for expressions/variables without #{}, it should be handled separately. - SeamELCompletionEngine engine = new SeamELCompletionEngine(seamProject); + SeamELCompletionEngine engine = new SeamELCompletionEngine(); //TODO refactor method checkStartPositionInEL boolean isInEl = checkStartPositionInEL(viewer, offset); @@ -435,7 +435,7 @@ ElVarSearcher varSearcher = new ElVarSearcher(engine); List<Var> vars = varSearcher.findAllVars(viewer, offset); - SeamELCompletionEngine fEngine= new SeamELCompletionEngine(seamProject); + SeamELCompletionEngine fEngine= new SeamELCompletionEngine(); List<TextProposal> suggestions = fEngine.getCompletions(file, document, prefix, offset + proposalPrefix.length() - prefix.length(), false, vars); List<TextProposal> uniqueSuggestions = fEngine.makeKbUnique(suggestions); @@ -525,6 +525,10 @@ if(superDefaultChars.indexOf(".")<0) { //$NON-NLS-1$ redhatDefaultChars.append('.'); } + if(superDefaultChars.indexOf("[")<0) { //$NON-NLS-1$ + redhatDefaultChars.append('['); + } + autoActivChars = new char[redhatDefaultChars.length()]; redhatDefaultChars.getChars(0, redhatDefaultChars.length(), autoActivChars, 0); store.setDefault(PreferenceConstants.CODEASSIST_AUTOACTIVATION_TRIGGERS_JAVA, redhatDefaultChars.toString()); Modified: trunk/seam/plugins/org.jboss.tools.seam.ui/src/org/jboss/tools/seam/ui/views/properties/SeamELAttributeContentProposalProvider.java =================================================================== --- trunk/seam/plugins/org.jboss.tools.seam.ui/src/org/jboss/tools/seam/ui/views/properties/SeamELAttributeContentProposalProvider.java 2009-06-11 18:39:49 UTC (rev 15894) +++ trunk/seam/plugins/org.jboss.tools.seam.ui/src/org/jboss/tools/seam/ui/views/properties/SeamELAttributeContentProposalProvider.java 2009-06-11 18:44:23 UTC (rev 15895) @@ -82,7 +82,7 @@ IProject project = file.getProject(); ISeamProject seamProject = SeamCorePlugin.getSeamProject(project, true); if(seamProject != null) { - engine = new SeamELCompletionEngine(seamProject); + engine = new SeamELCompletionEngine(); } }