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

Index: editor/tools/plugins/com.google.dart.tools.ui.web/src/com/google/dart/tools/ui/web/utils/WebEditor.java
diff --git a/editor/tools/plugins/com.google.dart.tools.ui.web/src/com/google/dart/tools/ui/web/utils/WebEditor.java b/editor/tools/plugins/com.google.dart.tools.ui.web/src/com/google/dart/tools/ui/web/utils/WebEditor.java
index 093b1c1ed509e46478a45d8d610b9365a02a3f6e..2d7ade87c50ceb7876129760f27f0d4045f6c084 100644
--- a/editor/tools/plugins/com.google.dart.tools.ui.web/src/com/google/dart/tools/ui/web/utils/WebEditor.java
+++ b/editor/tools/plugins/com.google.dart.tools.ui.web/src/com/google/dart/tools/ui/web/utils/WebEditor.java
@@ -13,11 +13,9 @@
  */
 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;
@@ -30,14 +28,10 @@ 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.
@@ -53,7 +47,11 @@ public abstract class WebEditor extends TextEditor {
   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
@@ -160,14 +158,4 @@ public abstract class WebEditor extends TextEditor {
     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()]));
-  }
-
 }