Cleaned up PHP Prefs (Code Assist, typing)

[phpeclipse.git] / net.sourceforge.phpeclipse / src / net / sourceforge / phpdt / ui / text / JavaTextTools.java

diff --git a/net.sourceforge.phpeclipse/src/net/sourceforge/phpdt/ui/text/JavaTextTools.java b/net.sourceforge.phpeclipse/src/net/sourceforge/phpdt/ui/text/JavaTextTools.java
index 946e308..0d592a8 100644 (file)
--- a/net.sourceforge.phpeclipse/src/net/sourceforge/phpdt/ui/text/JavaTextTools.java
+++ b/net.sourceforge.phpeclipse/src/net/sourceforge/phpdt/ui/text/JavaTextTools.java
@@ -5,7 +5,6 @@ package net.sourceforge.phpdt.ui.text;
  * All Rights Reserved.
  */
 
-import net.sourceforge.phpdt.internal.ui.text.FastJavaPartitionScanner;
 import net.sourceforge.phpdt.internal.ui.text.IPHPPartitions;
 import net.sourceforge.phpdt.internal.ui.text.JavaColorManager;
 import net.sourceforge.phpdt.internal.ui.text.phpdoc.PHPDocCodeScanner;
@@ -16,6 +15,7 @@ import net.sourceforge.phpeclipse.phpeditor.php.PHPPartitionScanner;
 import net.sourceforge.phpeclipse.phpeditor.php.SmartyCodeScanner;
 import net.sourceforge.phpeclipse.phpeditor.php.SmartyDocCodeScanner;
 
+import org.eclipse.core.resources.IFile;
 import org.eclipse.core.runtime.Preferences;
 import org.eclipse.jface.preference.IPreferenceStore;
 import org.eclipse.jface.text.IDocument;
@@ -26,6 +26,7 @@ import org.eclipse.jface.text.rules.IPartitionTokenScanner;
 import org.eclipse.jface.text.rules.RuleBasedScanner;
 import org.eclipse.jface.util.IPropertyChangeListener;
 import org.eclipse.jface.util.PropertyChangeEvent;
+import org.eclipse.ui.part.FileEditorInput;
 //
 //import org.phpeclipse.phpdt.internal.ui.text.FastJavaPartitionScanner;
 //import org.phpeclipse.phpdt.internal.ui.text.JavaColorManager;
@@ -46,7 +47,6 @@ import org.eclipse.jface.util.PropertyChangeEvent;
 public class JavaTextTools {
 
   private static PHPPartitionScanner HTML_PARTITION_SCANNER = null;
-
   private static PHPPartitionScanner PHP_PARTITION_SCANNER = null;
   private static PHPPartitionScanner SMARTY_PARTITION_SCANNER = null;
 
@@ -118,23 +118,37 @@ public class JavaTextTools {
    * @see org.phpeclipse.phpdt.ui.PreferenceConstants#getPreferenceStore()
    * @since 2.0
    */
-  public JavaTextTools(IPreferenceStore store) {
-    fPreferenceStore = store;
-    fPreferenceStore.addPropertyChangeListener(fPreferenceListener);
-
-    fColorManager = new JavaColorManager();
-    fCodeScanner = new PHPCodeScanner(fColorManager, store);
-    fMultilineCommentScanner = new SingleTokenPHPScanner(fColorManager, store, IPreferenceConstants.PHP_MULTILINE_COMMENT);
-    fSinglelineCommentScanner = new SingleTokenPHPScanner(fColorManager, store, IPreferenceConstants.PHP_SINGLELINE_COMMENT);
-    fStringScanner = new SingleTokenPHPScanner(fColorManager, store, IPreferenceConstants.PHP_STRING);
-    fPHPDocScanner = new PHPDocCodeScanner(fColorManager, store);
-    fHTMLScanner = new HTMLCodeScanner(fColorManager, store);
-    fSmartyScanner = new SmartyCodeScanner(fColorManager, store);
-    fSmartyDocScanner = new SmartyDocCodeScanner(fColorManager, store);
-//    fPartitionScanner = new FastJavaPartitionScanner();
-    fPartitionScanner = new PHPPartitionScanner();
-  }
-
+//  public JavaTextTools(IPreferenceStore store) {
+//    fPreferenceStore = store;
+//    fPreferenceStore.addPropertyChangeListener(fPreferenceListener);
+//
+//    fColorManager = new JavaColorManager();
+//    fCodeScanner = new PHPCodeScanner(fColorManager, store);
+//    fMultilineCommentScanner = new SingleTokenPHPScanner(fColorManager, store, IPreferenceConstants.PHP_MULTILINE_COMMENT);
+//    fSinglelineCommentScanner = new SingleTokenPHPScanner(fColorManager, store, IPreferenceConstants.PHP_SINGLELINE_COMMENT);
+//    fStringScanner = new SingleTokenPHPScanner(fColorManager, store, IPreferenceConstants.PHP_STRING);
+//    fPHPDocScanner = new PHPDocCodeScanner(fColorManager, store);
+//    fHTMLScanner = new HTMLCodeScanner(fColorManager, store);
+//    fSmartyScanner = new SmartyCodeScanner(fColorManager, store);
+//    fSmartyDocScanner = new SmartyDocCodeScanner(fColorManager, store);
+////    fPartitionScanner = new FastJavaPartitionScanner();
+//    fPartitionScanner = new PHPPartitionScanner();
+//  }
+  /**
+        * Creates a new Java text tools collection.
+        * @param store the preference store to initialize the text tools. The text tool
+        *                      instance installs a listener on the passed preference store to adapt itself to 
+        *                      changes in the preference store. In general <code>PreferenceConstants.
+        *                      getPreferenceStore()</code> should be used to initialize the text tools.
+        * @param coreStore optional preference store to initialize the text tools. The text tool
+        *                      instance installs a listener on the passed preference store to adapt itself to 
+        *                      changes in the preference store.
+        * @see org.eclipse.jdt.ui.PreferenceConstants#getPreferenceStore()
+        * @since 2.1
+        */
+       public JavaTextTools(IPreferenceStore store, Preferences coreStore) {
+               this(store, coreStore, true);
+       }
   /**
    * Creates a new Java text tools collection.
    * 
@@ -160,6 +174,7 @@ public class JavaTextTools {
       fCorePreferenceStore.addPropertyChangeListener(fPreferenceListener);
 
     fColorManager = new JavaColorManager(autoDisposeOnDisplayDispose);
+    
     fCodeScanner = new PHPCodeScanner(fColorManager, store);
     fMultilineCommentScanner = new SingleTokenPHPScanner(fColorManager, store, IPreferenceConstants.PHP_MULTILINE_COMMENT);
     fSinglelineCommentScanner = new SingleTokenPHPScanner(fColorManager, store, IPreferenceConstants.PHP_SINGLELINE_COMMENT);
@@ -364,25 +379,56 @@ public class JavaTextTools {
 
     return partitioner;
   }
-
        /**
-        * Sets up the Java document partitioner for the given document for the given partitioning.
+        * Sets up the Java document partitioner for the given document for the default partitioning.
         * 
         * @param document the document to be set up
+        * @since 3.0
+        */
+       public void setupJavaDocumentPartitioner(IDocument document) {
+               setupJavaDocumentPartitioner(document, IDocumentExtension3.DEFAULT_PARTITIONING,null);
+       }
+       /**
+        * Sets up the Java document partitioner for the given document for the given partitioning.
+        * @param document the document to be set up
         * @param partitioning the document partitioning
+        * @param element TODO
+        * 
         * @since 3.0
         */
-       public void setupJavaDocumentPartitioner(IDocument document, String partitioning) {
-               IDocumentPartitioner partitioner= createDocumentPartitioner();
-               if (document instanceof IDocumentExtension3) {
-                       IDocumentExtension3 extension3= (IDocumentExtension3) document;
-                       extension3.setDocumentPartitioner(partitioning, partitioner);
-               } else {
+       public void setupJavaDocumentPartitioner(IDocument document, String partitioning, Object element) {
+               IDocumentPartitioner partitioner = createDocumentPartitioner(".php");
+                        
+//             if (document instanceof IDocumentExtension3) {
+//                     IDocumentExtension3 extension3= (IDocumentExtension3) document;
+//                     extension3.setDocumentPartitioner(partitioning, partitioner);
+//             } else {
+                       document.setDocumentPartitioner(partitioner);
+//             }
+               partitioner.connect(document);
+       }
+       public void setupHTMLDocumentPartitioner(IDocument document, String partitioning, Object element) {
+               IDocumentPartitioner partitioner = createDocumentPartitioner(".html");
+                        
+//             if (document instanceof IDocumentExtension3) {
+//                     IDocumentExtension3 extension3= (IDocumentExtension3) document;
+//                     extension3.setDocumentPartitioner(partitioning, partitioner);
+//             } else {
+                       document.setDocumentPartitioner(partitioner);
+//             }
+               partitioner.connect(document);
+       }
+       public void setupSmartyDocumentPartitioner(IDocument document, String partitioning, Object element) {
+               IDocumentPartitioner partitioner = createDocumentPartitioner(".tpl");
+                        
+//             if (document instanceof IDocumentExtension3) {
+//                     IDocumentExtension3 extension3= (IDocumentExtension3) document;
+//                     extension3.setDocumentPartitioner(partitioning, partitioner);
+//             } else {
                        document.setDocumentPartitioner(partitioner);
-               }
+//             }
                partitioner.connect(document);
        }
-       
   /**
    * Returns the names of the document position categories used by the document
    * partitioners created by this object to manage their partition information.
@@ -431,6 +477,12 @@ public class JavaTextTools {
       fStringScanner.adaptToPreferenceChange(event);
     if (fPHPDocScanner.affectsBehavior(event))
       fPHPDocScanner.adaptToPreferenceChange(event);
+    if (fHTMLScanner.affectsBehavior(event))
+      fHTMLScanner.adaptToPreferenceChange(event);
+    if (fSmartyScanner.affectsBehavior(event))
+      fSmartyScanner.adaptToPreferenceChange(event);
+    if (fSmartyDocScanner.affectsBehavior(event))
+      fSmartyDocScanner.adaptToPreferenceChange(event);
   }
 
   /**