Author: scabanovich Date: 2008-10-01 11:33:13 -0400 (Wed, 01 Oct 2008) New Revision: 10598 Modified: trunk/jst/plugins/org.jboss.tools.jst.jsp/src/org/jboss/tools/jst/jsp/contentassist/FaceletsHtmlContentAssistProcessor.java 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/support/kb/WTPKbdBeanPropertyResource.java trunk/jst/plugins/org.jboss.tools.jst.jsp/src/org/jboss/tools/jst/jsp/support/kb/WTPKbdBundlePropertyResource.java Log: JBIDE-1497. Refactoring Modified: trunk/jst/plugins/org.jboss.tools.jst.jsp/src/org/jboss/tools/jst/jsp/contentassist/FaceletsHtmlContentAssistProcessor.java =================================================================== --- trunk/jst/plugins/org.jboss.tools.jst.jsp/src/org/jboss/tools/jst/jsp/contentassist/FaceletsHtmlContentAssistProcessor.java 2008-10-01 15:31:52 UTC (rev 10597) +++ trunk/jst/plugins/org.jboss.tools.jst.jsp/src/org/jboss/tools/jst/jsp/contentassist/FaceletsHtmlContentAssistProcessor.java 2008-10-01 15:33:13 UTC (rev 10598) @@ -51,6 +51,7 @@ import org.jboss.tools.common.el.core.model.ELUtil; import org.jboss.tools.common.el.core.parser.ELParser; import org.jboss.tools.common.el.core.parser.ELParserFactory; +import org.jboss.tools.common.el.core.parser.ELParserUtil; import org.jboss.tools.common.kb.AttributeDescriptor; import org.jboss.tools.common.kb.KbConnectorFactory; import org.jboss.tools.common.kb.KbConnectorType; @@ -272,7 +273,7 @@ } // No JBoss parser ? - ELParser p = ELParserFactory.createDefaultParser(); + ELParser p = ELParserUtil.getDefaultFactory().createParser(); ELModel model = p.parse(currentValue); ELInstance instance = ELUtil.findInstance(model, offset); if(instance != null && instance.getStartPosition() + 2 <= offset) { 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-10-01 15:31:52 UTC (rev 10597) +++ trunk/jst/plugins/org.jboss.tools.jst.jsp/src/org/jboss/tools/jst/jsp/contentassist/JSPActiveContentAssistProcessor.java 2008-10-01 15:33:13 UTC (rev 10598) @@ -24,6 +24,7 @@ import org.jboss.tools.common.el.core.model.ELUtil; import org.jboss.tools.common.el.core.parser.ELParser; import org.jboss.tools.common.el.core.parser.ELParserFactory; +import org.jboss.tools.common.el.core.parser.ELParserUtil; import org.jboss.tools.common.kb.KbException; import org.jboss.tools.common.kb.KbProposal; import org.jboss.tools.common.kb.KbQuery; @@ -270,7 +271,7 @@ * @return */ private int getELStartPosition(String matchString) { - ELParser p = ELParserFactory.createJbossParser(); + ELParser p = ELParserUtil.getJbossFactory().createParser(); ELModel model = p.parse(matchString); ELInstance is = ELUtil.findInstance(model, matchString.length()); return is == null ? -1 : is.getStartPosition(); @@ -304,7 +305,7 @@ currentValue.length() < matchString.length()) return -1; - ELParser p = ELParserFactory.createJbossParser(); + ELParser p = ELParserUtil.getJbossFactory().createParser(); ELModel model = p.parse(currentValue); ELInstance is = ELUtil.findInstance(model, matchString.length()); if(is == null || is.getCloseInstanceToken() == null) return -1; Modified: trunk/jst/plugins/org.jboss.tools.jst.jsp/src/org/jboss/tools/jst/jsp/support/kb/WTPKbdBeanPropertyResource.java =================================================================== --- trunk/jst/plugins/org.jboss.tools.jst.jsp/src/org/jboss/tools/jst/jsp/support/kb/WTPKbdBeanPropertyResource.java 2008-10-01 15:31:52 UTC (rev 10597) +++ trunk/jst/plugins/org.jboss.tools.jst.jsp/src/org/jboss/tools/jst/jsp/support/kb/WTPKbdBeanPropertyResource.java 2008-10-01 15:33:13 UTC (rev 10598) @@ -27,6 +27,7 @@ import org.jboss.tools.common.el.core.model.ELPropertyInvocation; import org.jboss.tools.common.el.core.parser.ELParser; import org.jboss.tools.common.el.core.parser.ELParserFactory; +import org.jboss.tools.common.el.core.parser.ELParserUtil; import org.jboss.tools.common.kb.KbDinamicResource; import org.jboss.tools.common.kb.KbProposal; import org.jboss.tools.common.kb.KbProposal.PostProcessing; @@ -59,7 +60,7 @@ try { if (!isReadyToUse()) return proposals; - ELParser p = ELParserFactory.createDefaultParser(); + ELParser p = ELParserUtil.getDefaultFactory().createParser(); ELModel model = p.parse(query); List<ELInstance> is = model.getInstances(); @@ -178,7 +179,7 @@ class PostProcessingImpl implements PostProcessing { public void process(KbProposal proposal, String value, int offset) { - ELParser p = ELParserFactory.createDefaultParser(); + ELParser p = ELParserUtil.getDefaultFactory().createParser(); ELModel model = p.parse(value); List<ELInstance> is = model.getInstances(); ELInvocationExpression expr = null; Modified: trunk/jst/plugins/org.jboss.tools.jst.jsp/src/org/jboss/tools/jst/jsp/support/kb/WTPKbdBundlePropertyResource.java =================================================================== --- trunk/jst/plugins/org.jboss.tools.jst.jsp/src/org/jboss/tools/jst/jsp/support/kb/WTPKbdBundlePropertyResource.java 2008-10-01 15:31:52 UTC (rev 10597) +++ trunk/jst/plugins/org.jboss.tools.jst.jsp/src/org/jboss/tools/jst/jsp/support/kb/WTPKbdBundlePropertyResource.java 2008-10-01 15:33:13 UTC (rev 10598) @@ -25,6 +25,7 @@ import org.jboss.tools.common.el.core.model.ELModel; import org.jboss.tools.common.el.core.parser.ELParser; import org.jboss.tools.common.el.core.parser.ELParserFactory; +import org.jboss.tools.common.el.core.parser.ELParserUtil; import org.jboss.tools.common.kb.KbDinamicResource; import org.jboss.tools.common.kb.KbProposal; import org.jboss.tools.common.model.XModelObject; @@ -49,7 +50,7 @@ try { if (!isReadyToUse()) return proposals; - ELParser p = ELParserFactory.createDefaultParser(); + ELParser p = ELParserUtil.getDefaultFactory().createParser(); ELModel model = p.parse(query); List<ELInstance> is = model.getInstances();