Author: scabanovich
Date: 2010-03-04 09:47:34 -0500 (Thu, 04 Mar 2010)
New Revision: 20670
Modified:
branches/jbosstools-3.1.x/jst/plugins/org.jboss.tools.jst.jsp/src/org/jboss/tools/jst/jsp/outline/JSPPropertySourceAdapter.java
Log:
https://jira.jboss.org/jira/browse/JBIDE-5995
Modified:
branches/jbosstools-3.1.x/jst/plugins/org.jboss.tools.jst.jsp/src/org/jboss/tools/jst/jsp/outline/JSPPropertySourceAdapter.java
===================================================================
---
branches/jbosstools-3.1.x/jst/plugins/org.jboss.tools.jst.jsp/src/org/jboss/tools/jst/jsp/outline/JSPPropertySourceAdapter.java 2010-03-04
14:45:36 UTC (rev 20669)
+++
branches/jbosstools-3.1.x/jst/plugins/org.jboss.tools.jst.jsp/src/org/jboss/tools/jst/jsp/outline/JSPPropertySourceAdapter.java 2010-03-04
14:47:34 UTC (rev 20670)
@@ -50,8 +50,6 @@
import org.jboss.tools.jst.web.kb.PageProcessor;
import org.jboss.tools.jst.web.kb.KbQuery.Type;
import org.jboss.tools.jst.web.kb.taglib.IAttribute;
-import org.jboss.tools.jst.web.kb.taglib.IComponent;
-import org.jboss.tools.jst.web.kb.taglib.ICustomTagLibComponent;
import org.w3c.dom.Attr;
import org.w3c.dom.DOMException;
import org.w3c.dom.Document;
@@ -126,6 +124,7 @@
processor.createContext(getTextViewer(), offset);
pageContext = processor.getContext();
kbQuery = createKbQuery(processor);
+ kbQuery.setMask(true);
kbQueryAttr = createKbQuery(processor);
}
@@ -647,19 +646,7 @@
}
private Map<String, IAttribute> getAttributes() {
- IComponent[] components = PageProcessor.getInstance().getComponents(kbQuery,
pageContext, true);
- Map<String, IAttribute> map = new HashMap<String, IAttribute>();
- for (IComponent component: components) {
- IAttribute[] as = component.getAttributes();
- for (IAttribute a: as) {
- String n = a.getName();
- if(map.containsKey(n) && !(component instanceof ICustomTagLibComponent)) {
- continue;
- }
- map.put(n, a);
- }
- }
- return map;
+ return PageProcessor.getInstance().getAttributesAsMap(kbQuery, pageContext);
}
//////// XMLPropertyDescriptor