Author: vrubezhny
Date: 2009-09-04 12:50:29 -0400 (Fri, 04 Sep 2009)
New Revision: 17469
Modified:
branches/jbosstools-3.1.0.M3/jst/plugins/org.jboss.tools.jst.jsp/src/org/jboss/tools/jst/jsp/contentassist/AbstractXMLContentAssistProcessor.java
branches/jbosstools-3.1.0.M3/jst/plugins/org.jboss.tools.jst.jsp/src/org/jboss/tools/jst/jsp/contentassist/XmlContentAssistProcessor.java
Log:
JBIDE-4848: The Content Assist doesn't show proposals for the attribute names (The
issue is found by
org.jboss.tools.jst.jsp.test.ca.JsfJspJbide1717Test.testJstJspJbide1717() JUnit Test
Case)
Issue is fixed for branch jbosstools-3.1.0.M3
Modified:
branches/jbosstools-3.1.0.M3/jst/plugins/org.jboss.tools.jst.jsp/src/org/jboss/tools/jst/jsp/contentassist/AbstractXMLContentAssistProcessor.java
===================================================================
---
branches/jbosstools-3.1.0.M3/jst/plugins/org.jboss.tools.jst.jsp/src/org/jboss/tools/jst/jsp/contentassist/AbstractXMLContentAssistProcessor.java 2009-09-04
16:23:46 UTC (rev 17468)
+++
branches/jbosstools-3.1.0.M3/jst/plugins/org.jboss.tools.jst.jsp/src/org/jboss/tools/jst/jsp/contentassist/AbstractXMLContentAssistProcessor.java 2009-09-04
16:50:29 UTC (rev 17469)
@@ -842,7 +842,7 @@
*
* @return
*/
- protected String getParent(boolean returnAttributeName) {
+ protected String getParent(boolean returnAttributeName, boolean returnThisElement) {
IStructuredModel sModel = StructuredModelManager
.getModelManager()
.getExistingModelForRead(getDocument());
@@ -884,7 +884,8 @@
n = n.getParentNode();
}
} else {
- n = n.getParentNode();
+ if (!returnThisElement)
+ n = n.getParentNode();
}
if (n == null)
return null;
Modified:
branches/jbosstools-3.1.0.M3/jst/plugins/org.jboss.tools.jst.jsp/src/org/jboss/tools/jst/jsp/contentassist/XmlContentAssistProcessor.java
===================================================================
---
branches/jbosstools-3.1.0.M3/jst/plugins/org.jboss.tools.jst.jsp/src/org/jboss/tools/jst/jsp/contentassist/XmlContentAssistProcessor.java 2009-09-04
16:23:46 UTC (rev 17468)
+++
branches/jbosstools-3.1.0.M3/jst/plugins/org.jboss.tools.jst.jsp/src/org/jboss/tools/jst/jsp/contentassist/XmlContentAssistProcessor.java 2009-09-04
16:50:29 UTC (rev 17469)
@@ -85,7 +85,7 @@
String prefix = getTagPrefix();
String uri = getTagUri();
String[] parentTags = getParentTags(type == Type.ATTRIBUTE_NAME || type ==
Type.ATTRIBUTE_VALUE);
- String parent = getParent(type == Type.ATTRIBUTE_VALUE);
+ String parent = getParent(type == Type.ATTRIBUTE_VALUE, type == Type.ATTRIBUTE_NAME);
String queryValue = query;
String queryStringValue = stringQuery;
Show replies by date