Author: akazakov Date: 2007-08-07 13:38:23 -0400 (Tue, 07 Aug 2007) New Revision: 2945 Modified: trunk/jst/plugins/org.jboss.tools.jst.jsp/src/org/jboss/tools/jst/jsp/ExtendedStructuredTextViewerConfigurationJSP.java Log: Rollback to 2434 version. It seems Viktor broke JSP Configuration. Modified: trunk/jst/plugins/org.jboss.tools.jst.jsp/src/org/jboss/tools/jst/jsp/ExtendedStructuredTextViewerConfigurationJSP.java =================================================================== --- trunk/jst/plugins/org.jboss.tools.jst.jsp/src/org/jboss/tools/jst/jsp/ExtendedStructuredTextViewerConfigurationJSP.java 2007-08-07 17:06:07 UTC (rev 2944) +++ trunk/jst/plugins/org.jboss.tools.jst.jsp/src/org/jboss/tools/jst/jsp/ExtendedStructuredTextViewerConfigurationJSP.java 2007-08-07 17:38:23 UTC (rev 2945) @@ -48,8 +48,7 @@ // to define them in plugin.xml file of their // plugins using extention point // "org.jboss.tools.common.text.xml.contentAssistProcessor" - IContentAssistProcessor[] superProcessors = super.getContentAssistProcessors(sourceViewer, partitionType); - + ContentAssistProcessorDefinition[] defs = ContentAssistProcessorBuilder.getInstance().getContentAssistProcessorDefinitions(partitionType); if(defs==null) return null; @@ -70,11 +69,10 @@ (partitionType == IJSPPartitions.JSP_DEFAULT_EL) || (partitionType == IJSPPartitions.JSP_DEFAULT_EL2)) { processors.add(new RedHatJSPContentAssistProcessor()); + return (IContentAssistProcessor[])processors.toArray(new IContentAssistProcessor[0]); } - if (superProcessors != null && superProcessors.length > 0) - processors.add(superProcessors); - return (IContentAssistProcessor[])processors.toArray(new IContentAssistProcessor[0]); + return super.getContentAssistProcessors(sourceViewer, partitionType); } /*