php formatter based on the JDT java formatter (very early version)

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

diff --git a/net.sourceforge.phpeclipse/src/net/sourceforge/phpdt/internal/ui/preferences/TemplatePreferencePage.java b/net.sourceforge.phpeclipse/src/net/sourceforge/phpdt/internal/ui/preferences/TemplatePreferencePage.java
index b90c52c..2fc70d4 100644 (file)
--- a/net.sourceforge.phpeclipse/src/net/sourceforge/phpdt/internal/ui/preferences/TemplatePreferencePage.java
+++ b/net.sourceforge.phpeclipse/src/net/sourceforge/phpdt/internal/ui/preferences/TemplatePreferencePage.java
@@ -17,6 +17,7 @@ import net.sourceforge.phpdt.internal.ui.util.SWTUtil;
 import net.sourceforge.phpeclipse.PHPeclipsePlugin;
 import net.sourceforge.phpeclipse.phpeditor.PHPEditorEnvironment;
 import net.sourceforge.phpeclipse.phpeditor.PHPSourceViewerConfiguration;
+
 import org.eclipse.core.runtime.CoreException;
 import org.eclipse.jface.dialogs.ErrorDialog;
 import org.eclipse.jface.dialogs.MessageDialog;
@@ -344,7 +345,7 @@ public class TemplatePreferencePage extends PreferencePage implements IWorkbench
     //         document.setDocumentPartitioner(partitioner);
     //         partitioner.connect(document);          
 
-    viewer.configure(new PHPSourceViewerConfiguration()); // (tools, null));
+    viewer.configure(new PHPSourceViewerConfiguration(null)); // (tools, null));
     viewer.setEditable(false);
     viewer.setDocument(document);
     viewer.getTextWidget().setBackground(getShell().getDisplay().getSystemColor(SWT.COLOR_WIDGET_BACKGROUND));
@@ -410,7 +411,7 @@ public class TemplatePreferencePage extends PreferencePage implements IWorkbench
     template.setContext(contextTypeName); //$NON-NLS-1$
 
     EditTemplateDialog dialog = new EditTemplateDialog(getShell(), template, false);
-    if (dialog.open() == dialog.OK) {
+    if (dialog.open() == EditTemplateDialog.OK) {
       fTemplates.add(template);
       fTableViewer.refresh();
       fTableViewer.setChecked(template, template.isEnabled());
@@ -432,7 +433,7 @@ public class TemplatePreferencePage extends PreferencePage implements IWorkbench
   private void edit(Template template) {
     Template newTemplate = new Template(template);
     EditTemplateDialog dialog = new EditTemplateDialog(getShell(), newTemplate, true);
-    if (dialog.open() == dialog.OK) {
+    if (dialog.open() == EditTemplateDialog.OK) {
 
       if (!newTemplate.getName().equals(template.getName()) && MessageDialog.openQuestion(getShell(), TemplateMessages.getString("TemplatePreferencePage.question.create.new.title"), //$NON-NLS-1$
       TemplateMessages.getString("TemplatePreferencePage.question.create.new.message"))) //$NON-NLS-1$