Author: vrubezhny
Date: 2008-06-30 15:28:31 -0400 (Mon, 30 Jun 2008)
New Revision: 9032
Modified:
trunk/jst/plugins/org.jboss.tools.jst.jsp/src/org/jboss/tools/jst/jsp/contentassist/JSPActiveContentAssistProcessor.java
Log:
http://jira.jboss.com/jira/browse/JBIDE-2437 CA suggests only proposals for EL.
Issue is fixed for 3.0.0
Modified:
trunk/jst/plugins/org.jboss.tools.jst.jsp/src/org/jboss/tools/jst/jsp/contentassist/JSPActiveContentAssistProcessor.java
===================================================================
---
trunk/jst/plugins/org.jboss.tools.jst.jsp/src/org/jboss/tools/jst/jsp/contentassist/JSPActiveContentAssistProcessor.java 2008-06-30
19:08:58 UTC (rev 9031)
+++
trunk/jst/plugins/org.jboss.tools.jst.jsp/src/org/jboss/tools/jst/jsp/contentassist/JSPActiveContentAssistProcessor.java 2008-06-30
19:28:31 UTC (rev 9032)
@@ -78,7 +78,6 @@
return;
}
-// String strippedValueForQuery = strippedValue;
int elStartPosition = getELStartPosition(matchString);
int delta = 0;
String elProposalPrefix = "";
@@ -87,7 +86,6 @@
if (elStartPosition == -1) {
queryString = matchString;
elQueryString = "#{";
-// strippedValueForQuery = "";
delta = matchString.length();
if(isCharSharp(matchString, offset-1)) {
elProposalPrefix = "{"; //$NON-NLS-1$
@@ -104,13 +102,11 @@
// in case of EL-expression
queryString = null;
elQueryString = matchString.substring(elStartPosition);
-// strippedValueForQuery = elQueryString;
delta = matchString.length() - elQueryString.length();
}
// Correct delta if matchString starts with a quote (exclude that quote)
if (matchString.startsWith("\"") ||
matchString.startsWith("'")) {
-// strippedValueForQuery = matchString.substring(0,1) + strippedValueForQuery;
delta--;
}
@@ -301,7 +297,7 @@
}
/*
- * Checks if the EL operand starting characters are present
+ * Checks if the EL operand ending character is present
* @return
*/
private int getELEndPosition(String matchString, String currentValue) {