Big merge from experimental to bleeding edge.

editor/tools/plugins/com.google.dart.tools.ui.web/src/com/google/dart/tools/ui/web/utils/WebEditor.java

 /*
  * Copyright (c) 2012, the Dart project authors.
  * 
  * Licensed under the Eclipse Public License v1.0 (the "License"); you may not use this file except
  * in compliance with the License. You may obtain a copy of the License at
  * 
  * http://www.eclipse.org/legal/epl-v10.html
  * 
  * Unless required by applicable law or agreed to in writing, software distributed under the License
  * is distributed on an "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express
  * or implied. See the License for the specific language governing permissions and limitations under
  * the License.
  */
 package com.google.dart.tools.ui.web.utils;
 
-import com.google.dart.tools.core.DartCore;
 import com.google.dart.tools.ui.DartToolsPlugin;
 import com.google.dart.tools.ui.PreferenceConstants;
 import com.google.dart.tools.ui.internal.text.editor.saveactions.RemoveTrailingWhitespaceAction;
-import com.google.dart.tools.ui.internal.text.functions.PreferencesAdapter;
 
 import org.eclipse.core.resources.IFile;
 import org.eclipse.core.runtime.IProgressMonitor;
 import org.eclipse.jface.action.IMenuManager;
 import org.eclipse.jface.preference.IPreferenceStore;
 import org.eclipse.jface.text.DocumentEvent;
 import org.eclipse.jface.text.IDocument;
 import org.eclipse.jface.text.IDocumentListener;
 import org.eclipse.jface.text.IRegion;
 import org.eclipse.swt.widgets.Composite;
 import org.eclipse.ui.IEditorInput;
 import org.eclipse.ui.IFileEditorInput;
-import org.eclipse.ui.editors.text.EditorsUI;
 import org.eclipse.ui.editors.text.TextEditor;
-import org.eclipse.ui.texteditor.ChainedPreferenceStore;
 import org.eclipse.ui.texteditor.ITextEditorActionConstants;
 
 import java.lang.reflect.InvocationTargetException;
-import java.util.ArrayList;
-import java.util.List;
 
 /**
  * The abstract superclass of the html and css editors.
  */
 public abstract class WebEditor extends TextEditor {
 
   public final static String MATCHING_BRACKETS = "matchingBrackets";
   public final static String MATCHING_BRACKETS_COLOR = "matchingBracketsColor";
 
   /**
    * Removes trailing whitespace on editor saves.
    */
   private RemoveTrailingWhitespaceAction removeTrailingWhitespaceAction;
 
   public WebEditor() {
-    setPreferenceStore(createPreferenceStore());
+    // Enable bracket highlighting in the preference store.
+    IPreferenceStore store = getPreferenceStore();
+
+    store.setDefault(MATCHING_BRACKETS, true);
+    store.setDefault(MATCHING_BRACKETS_COLOR, "128,128,128");
   }
 
   @Override
   public void createPartControl(Composite parent) {
     super.createPartControl(parent);
 
     getDocument().addDocumentListener(new IDocumentListener() {
       @Override
       public void documentAboutToBeChanged(DocumentEvent event) {
 
@@ skipping 86 matching lines @@
   }
 
   @Override
   protected void rulerContextMenuAboutToShow(IMenuManager menu) {
     super.rulerContextMenuAboutToShow(menu);
 
     // Remove the Preferences menu item
     menu.remove(ITextEditorActionConstants.RULER_PREFERENCES);
   }
 
-  private IPreferenceStore createPreferenceStore() {
-    List<IPreferenceStore> stores = new ArrayList<IPreferenceStore>();
-
-    stores.add(DartToolsPlugin.getDefault().getPreferenceStore());
-    stores.add(new PreferencesAdapter(DartCore.getPlugin().getPluginPreferences()));
-    stores.add(EditorsUI.getPreferenceStore());
-
-    return new ChainedPreferenceStore(stores.toArray(new IPreferenceStore[stores.size()]));
-  }
-
 }