Author: vrubezhny Date: 2009-06-05 13:16:44 -0400 (Fri, 05 Jun 2009) New Revision: 15755 Modified: trunk/jst/plugins/org.jboss.tools.jst.web.kb/src/org/jboss/tools/jst/web/kb/PageProcessor.java trunk/jst/plugins/org.jboss.tools.jst.web.kb/src/org/jboss/tools/jst/web/kb/internal/taglib/AbstractComponent.java trunk/jst/plugins/org.jboss.tools.jst.web.kb/src/org/jboss/tools/jst/web/kb/taglib/CustomTagLibManager.java Log: JBIDE-2808: Improve/refactor org.jboss.tools.common.kb plugin. A number of methods are fixed: a number of NullPointerException's are fixed. Modified: trunk/jst/plugins/org.jboss.tools.jst.web.kb/src/org/jboss/tools/jst/web/kb/PageProcessor.java =================================================================== --- trunk/jst/plugins/org.jboss.tools.jst.web.kb/src/org/jboss/tools/jst/web/kb/PageProcessor.java 2009-06-05 16:31:06 UTC (rev 15754) +++ trunk/jst/plugins/org.jboss.tools.jst.web.kb/src/org/jboss/tools/jst/web/kb/PageProcessor.java 2009-06-05 17:16:44 UTC (rev 15755) @@ -55,7 +55,7 @@ proposals.add(libProposals[j]); } } - for (int i = 0; i < customTagLibs.length; i++) { + for (int i = 0; customTagLibs != null && i < customTagLibs.length; i++) { // TODO } if(query.getType() == KbQuery.Type.ATTRIBUTE_VALUE || ((query.getType() == KbQuery.Type.TEXT )&& context instanceof IFaceletPageContext)) { Modified: trunk/jst/plugins/org.jboss.tools.jst.web.kb/src/org/jboss/tools/jst/web/kb/internal/taglib/AbstractComponent.java =================================================================== --- trunk/jst/plugins/org.jboss.tools.jst.web.kb/src/org/jboss/tools/jst/web/kb/internal/taglib/AbstractComponent.java 2009-06-05 16:31:06 UTC (rev 15754) +++ trunk/jst/plugins/org.jboss.tools.jst.web.kb/src/org/jboss/tools/jst/web/kb/internal/taglib/AbstractComponent.java 2009-06-05 17:16:44 UTC (rev 15755) @@ -285,11 +285,11 @@ } } else if(query.getType() == KbQuery.Type.ATTRIBUTE_VALUE) { for (int i = 0; i < attributes.length; i++) { - TextProposal[] attributeProposals = attributes[i].getProposals(query, context); - if(attributeProposals.length > 0 && proposals == null) { + TextProposal[] attributeProposals = (attributes[i] == null ? null : attributes[i].getProposals(query, context)); + if(attributeProposals != null && attributeProposals.length > 0 && proposals == null) { proposals = new ArrayList<TextProposal>(); } - for (int j = 0; j < attributeProposals.length; j++) { + for (int j = 0; attributeProposals != null && j < attributeProposals.length; j++) { proposals.add(attributeProposals[j]); } } Modified: trunk/jst/plugins/org.jboss.tools.jst.web.kb/src/org/jboss/tools/jst/web/kb/taglib/CustomTagLibManager.java =================================================================== --- trunk/jst/plugins/org.jboss.tools.jst.web.kb/src/org/jboss/tools/jst/web/kb/taglib/CustomTagLibManager.java 2009-06-05 16:31:06 UTC (rev 15754) +++ trunk/jst/plugins/org.jboss.tools.jst.web.kb/src/org/jboss/tools/jst/web/kb/taglib/CustomTagLibManager.java 2009-06-05 17:16:44 UTC (rev 15755) @@ -53,6 +53,8 @@ Set<ICustomTagLibrary> libSet = new HashSet<ICustomTagLibrary>(); IExtensionRegistry registry = Platform.getExtensionRegistry(); IExtensionPoint extensionPoint = registry.getExtensionPoint("org.jboss.tools.jst.web.kb.KbTagLib"); //$NON-NLS-1$ + if (extensionPoint == null) + return null; IExtension[] extensions = extensionPoint.getExtensions(); for (int i=0; i<extensions.length; i++) { IExtension extension = extensions[i];