Switched to Eclipse 2.1 development; eliminated JTidy package => now standalone plugin

[phpeclipse.git] / net.sourceforge.phpeclipse / src / net / sourceforge / phpeclipse / phpeditor / PHPSourceViewerConfiguration.java

diff --git a/net.sourceforge.phpeclipse/src/net/sourceforge/phpeclipse/phpeditor/PHPSourceViewerConfiguration.java b/net.sourceforge.phpeclipse/src/net/sourceforge/phpeclipse/phpeditor/PHPSourceViewerConfiguration.java
index 5c0e7b1..6f2c2f6 100644 (file)
--- a/net.sourceforge.phpeclipse/src/net/sourceforge/phpeclipse/phpeditor/PHPSourceViewerConfiguration.java
+++ b/net.sourceforge.phpeclipse/src/net/sourceforge/phpeclipse/phpeditor/PHPSourceViewerConfiguration.java
@@ -20,6 +20,7 @@ import net.sourceforge.phpeclipse.phpeditor.php.PHPCompletionProcessor;
 import net.sourceforge.phpeclipse.phpeditor.php.PHPDoubleClickSelector;
 import net.sourceforge.phpeclipse.phpeditor.php.PHPPartitionScanner;
 import net.sourceforge.phpeclipse.phpeditor.util.PHPColorProvider;
+
 import org.eclipse.jface.preference.IPreferenceStore;
 import org.eclipse.jface.text.DefaultAutoIndentStrategy;
 import org.eclipse.jface.text.IAutoIndentStrategy;
@@ -94,8 +95,8 @@ public class PHPSourceViewerConfiguration extends SourceViewerConfiguration {
 
     assistant.enableAutoActivation(true);
     assistant.setAutoActivationDelay(500);
-    assistant.setProposalPopupOrientation(assistant.PROPOSAL_OVERLAY);
-    assistant.setContextInformationPopupOrientation(assistant.CONTEXT_INFO_ABOVE);
+    assistant.setProposalPopupOrientation(ContentAssistant.PROPOSAL_OVERLAY);
+    assistant.setContextInformationPopupOrientation(ContentAssistant.CONTEXT_INFO_ABOVE);
     assistant.setContextInformationPopupBackground(PHPEditorEnvironment.getPHPColorProvider().getColor(new RGB(150, 150, 0)));
 
     return assistant;
@@ -193,7 +194,7 @@ public class PHPSourceViewerConfiguration extends SourceViewerConfiguration {
 //    reconciler.setDamager(dr, PHPPartitionScanner.HTML);
 //    reconciler.setRepairer(dr, PHPPartitionScanner.HTML);
 
-    dr = new DefaultDamagerRepairer(new SingleTokenScanner(new TextAttribute(provider.getColor(provider.MULTI_LINE_COMMENT))));
+    dr = new DefaultDamagerRepairer(new SingleTokenScanner(new TextAttribute(provider.getColor(PHPColorProvider.MULTI_LINE_COMMENT))));
     reconciler.setDamager(dr, PHPPartitionScanner.HTML_MULTILINE_COMMENT);
     reconciler.setRepairer(dr, PHPPartitionScanner.HTML_MULTILINE_COMMENT);