PHP highlighting colors could now be managed by the new PreferencePage

[phpeclipse.git] / net.sourceforge.phpeclipse / src / net / sourceforge / phpdt / internal / ui / preferences / EditTemplateDialog.java

diff --git a/net.sourceforge.phpeclipse/src/net/sourceforge/phpdt/internal/ui/preferences/EditTemplateDialog.java b/net.sourceforge.phpeclipse/src/net/sourceforge/phpdt/internal/ui/preferences/EditTemplateDialog.java
index 3458acd..cf895cd 100644 (file)
--- a/net.sourceforge.phpeclipse/src/net/sourceforge/phpdt/internal/ui/preferences/EditTemplateDialog.java
+++ b/net.sourceforge.phpeclipse/src/net/sourceforge/phpdt/internal/ui/preferences/EditTemplateDialog.java
@@ -19,6 +19,7 @@ import net.sourceforge.phpdt.internal.ui.dialog.StatusDialog;
 import net.sourceforge.phpdt.internal.ui.dialog.StatusInfo;
 import net.sourceforge.phpdt.internal.ui.text.template.TemplateVariableProcessor;
 import net.sourceforge.phpdt.internal.ui.util.SWTUtil;
+import net.sourceforge.phpdt.ui.text.JavaTextTools;
 import net.sourceforge.phpeclipse.IPreferenceConstants;
 import net.sourceforge.phpeclipse.PHPeclipsePlugin;
 import net.sourceforge.phpeclipse.phpeditor.PHPSourceViewerConfiguration;
@@ -36,6 +37,7 @@ import org.eclipse.jface.preference.PreferenceConverter;
 import org.eclipse.jface.resource.JFaceResources;
 import org.eclipse.jface.text.Document;
 import org.eclipse.jface.text.IDocument;
+import org.eclipse.jface.text.IDocumentPartitioner;
 import org.eclipse.jface.text.ITextListener;
 import org.eclipse.jface.text.ITextOperationTarget;
 import org.eclipse.jface.text.ITextViewer;
@@ -85,8 +87,8 @@ public class EditTemplateDialog extends StatusDialog {
                private final IContentAssistProcessor fProcessor;
 
        //      SimpleJavaSourceViewerConfiguration(JavaTextTools tools, ITextEditor editor, IContentAssistProcessor processor) {
-               SimpleJavaSourceViewerConfiguration(IContentAssistProcessor processor) {        
-      super(null);
+               SimpleJavaSourceViewerConfiguration(JavaTextTools tools, IContentAssistProcessor processor) {   
+      super(tools, null);
                        fProcessor= processor;
                }
                
@@ -100,7 +102,7 @@ public class EditTemplateDialog extends StatusDialog {
                        ContentAssistant assistant= new ContentAssistant();
                        assistant.setContentAssistProcessor(fProcessor, IDocument.DEFAULT_CONTENT_TYPE);
                                // Register the same processor for strings and single line comments to get code completion at the start of those partitions.
-//                     assistant.setContentAssistProcessor(fProcessor, JavaPartitionScanner.JAVA_STRING);
+//                     assistant.setContentAssistProcessor(fProcessor, JavaPartitionScanner.PHP_STRING);
 //                     assistant.setContentAssistProcessor(fProcessor, JavaPartitionScanner.JAVA_SINGLE_LINE_COMMENT);
 //                     
 //                     assistant.setContentAssistProcessor(fProcessor, JavaPartitionScanner.JAVA_DOC);
@@ -329,13 +331,13 @@ public class EditTemplateDialog extends StatusDialog {
 
        private SourceViewer createEditor(Composite parent) {
                SourceViewer viewer= new SourceViewer(parent, null, SWT.BORDER | SWT.V_SCROLL | SWT.H_SCROLL);
-       //      JavaTextTools tools= JavaPlugin.getDefault().getJavaTextTools();
+         JavaTextTools tools= PHPeclipsePlugin.getDefault().getJavaTextTools();
                IDocument document= new Document(fTemplate.getPattern());
-       //      IDocumentPartitioner partitioner= tools.createDocumentPartitioner();
-       //      document.setDocumentPartitioner(partitioner);
-       //      partitioner.connect(document);          
+               IDocumentPartitioner partitioner= tools.createDocumentPartitioner();
+               document.setDocumentPartitioner(partitioner);
+               partitioner.connect(document);          
        //      viewer.configure(new SimpleJavaSourceViewerConfiguration(tools, null, fProcessor));
-               viewer.configure(new SimpleJavaSourceViewerConfiguration(fProcessor));
+               viewer.configure(new SimpleJavaSourceViewerConfiguration(tools, fProcessor));
     viewer.setEditable(true);
                viewer.setDocument(document);