X-Git-Url: http://git.phpeclipse.com

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..7a33214 100644
--- 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
@@ -15,13 +15,15 @@ import net.sourceforge.phpdt.internal.corext.template.ContextTypeRegistry;
 import net.sourceforge.phpdt.internal.corext.template.Template;
 import net.sourceforge.phpdt.internal.corext.template.TemplateMessages;
 import net.sourceforge.phpdt.internal.corext.template.TemplateTranslator;
-import net.sourceforge.phpdt.internal.ui.dialog.StatusDialog;
-import net.sourceforge.phpdt.internal.ui.dialog.StatusInfo;
+import net.sourceforge.phpdt.internal.ui.dialogs.StatusDialog;
+import net.sourceforge.phpdt.internal.ui.dialogs.StatusInfo;
+import net.sourceforge.phpdt.internal.ui.text.IPHPPartitions;
 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.phpdt.ui.text.PHPSourceViewerConfiguration;
 import net.sourceforge.phpeclipse.IPreferenceConstants;
 import net.sourceforge.phpeclipse.PHPeclipsePlugin;
-import net.sourceforge.phpeclipse.phpeditor.PHPSourceViewerConfiguration;
 
 import org.eclipse.core.runtime.CoreException;
 import org.eclipse.jface.action.Action;
@@ -36,6 +38,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 +88,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, IPHPPartitions.PHP_PARTITIONING);
 			fProcessor= processor;
 		}
 		
@@ -100,7 +103,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 +332,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);