Author: vrubezhny
Date: 2009-05-27 09:57:48 -0400 (Wed, 27 May 2009)
New Revision: 15559
Modified:
trunk/jst/plugins/org.jboss.tools.jst.jsp/src/org/jboss/tools/jst/jsp/contentassist/FaceletPageContectAssistProcessor.java
Log:
JBIDE-2808: Improve/refactor org.jboss.tools.common.kb plugin.
NameSpaces calculation is corrected for xmlns-attributes
Modified:
trunk/jst/plugins/org.jboss.tools.jst.jsp/src/org/jboss/tools/jst/jsp/contentassist/FaceletPageContectAssistProcessor.java
===================================================================
---
trunk/jst/plugins/org.jboss.tools.jst.jsp/src/org/jboss/tools/jst/jsp/contentassist/FaceletPageContectAssistProcessor.java 2009-05-27
13:55:17 UTC (rev 15558)
+++
trunk/jst/plugins/org.jboss.tools.jst.jsp/src/org/jboss/tools/jst/jsp/contentassist/FaceletPageContectAssistProcessor.java 2009-05-27
13:57:48 UTC (rev 15559)
@@ -17,6 +17,7 @@
import org.eclipse.wst.sse.core.StructuredModelManager;
import org.eclipse.wst.sse.core.internal.provisional.IStructuredModel;
import org.eclipse.wst.sse.core.internal.provisional.IndexedRegion;
+import org.eclipse.wst.xml.core.internal.provisional.document.IDOMElement;
import org.eclipse.wst.xml.core.internal.provisional.document.IDOMModel;
import org.eclipse.wst.xml.core.internal.provisional.document.IDOMNode;
import org.jboss.tools.jst.web.kb.IFaceletPageContext;
@@ -100,18 +101,24 @@
final String uri = a.getValue();
if (prefix != null && prefix.trim().length() > 0 &&
uri != null && uri.trim().length() > 0) {
+
+ int start = ((IndexedRegion)n).getStartOffset();
+ int length = ((IndexedRegion)n).getLength();
+
+ IDOMElement domElement = (n instanceof IDOMElement ? (IDOMElement)n : null);
+ if (domElement != null) {
+ start = domElement.getStartOffset();
+ length = (domElement.hasEndTag() ?
+ domElement.getEndStructuredDocumentRegion().getEnd() :
+ domElement.getLength());
- // TODO: Check the IRegion instance creation
- IRegion region = new Region(
- ((IndexedRegion)n).getStartOffset(),
- ((IndexedRegion)n).getLength());
-
+ }
+
+ Region region = new Region(start, length);
INameSpace nameSpace = new INameSpace(){
-
public String getURI() {
return uri.trim();
}
-
public String getPrefix() {
return prefix.trim();
}
Show replies by date