DevTools: merge excluded folder manager into isolated file system.

third_party/WebKit/Source/devtools/front_end/settings/EditFileSystemDialog.js

 /*
  * Copyright (C) 2013 Google Inc. All rights reserved.
  *
  * Redistribution and use in source and binary forms, with or without
  * modification, are permitted provided that the following conditions are
  * met:
  *
  *     * Redistributions of source code must retain the above copyright
  * notice, this list of conditions and the following disclaimer.
  *     * Redistributions in binary form must reproduce the above
@@ skipping 33 matching lines @@
     headerText.textContent = WebInspector.UIString("Edit file system");
 
     var closeButton = header.createChild("div", "done-button", "dt-close-button");
     closeButton.gray = true;
     closeButton.addEventListener("click", this._onDoneClick.bind(this), false);
 
     var contents = this.element.createChild("div", "contents");
 
     WebInspector.fileSystemMapping.addEventListener(WebInspector.FileSystemMapping.Events.FileMappingAdded, this._fileMappingAdded, this);
     WebInspector.fileSystemMapping.addEventListener(WebInspector.FileSystemMapping.Events.FileMappingRemoved, this._fileMappingRemoved, this);
-    WebInspector.isolatedFileSystemManager.excludedFolderManager().addEventListener(WebInspector.ExcludedFolderManager.Events.ExcludedFolderAdded, this._excludedFolderAdded, this);
-    WebInspector.isolatedFileSystemManager.excludedFolderManager().addEventListener(WebInspector.ExcludedFolderManager.Events.ExcludedFolderRemoved, this._excludedFolderRemoved, this);
+    WebInspector.isolatedFileSystemManager.addEventListener(WebInspector.IsolatedFileSystemManager.Events.ExcludedFolderAdded, this._excludedFolderAdded, this);
+    WebInspector.isolatedFileSystemManager.addEventListener(WebInspector.IsolatedFileSystemManager.Events.ExcludedFolderRemoved, this._excludedFolderRemoved, this);
 
     var blockHeader = contents.createChild("div", "block-header");
     blockHeader.textContent = WebInspector.UIString("Mappings");
     this._fileMappingsSection = contents.createChild("div", "section");
     this._fileMappingsListContainer = this._fileMappingsSection.createChild("div", "settings-list-container");
     var entries = WebInspector.fileSystemMapping.mappingEntries(this._fileSystemPath);
 
     var urlColumn = { id: "url", placeholder: WebInspector.UIString("URL prefix") };
     var pathColumn = { id: "path", placeholder: WebInspector.UIString("Folder path") };
 
     this._fileMappingsList = new WebInspector.EditableSettingsList([urlColumn, pathColumn], this._fileMappingValuesProvider.bind(this), this._fileMappingValidate.bind(this), this._fileMappingEdit.bind(this));
     this._fileMappingsList.addEventListener(WebInspector.SettingsList.Events.Removed, this._fileMappingRemovedfromList.bind(this));
 
     this._fileMappingsList.element.classList.add("file-mappings-list");
     this._fileMappingsListContainer.appendChild(this._fileMappingsList.element);
 
     this._entries = {};
     for (var i = 0; i < entries.length; ++i)
         this._addMappingRow(entries[i]);
 
     blockHeader = contents.createChild("div", "block-header");
     blockHeader.textContent = WebInspector.UIString("Excluded folders");
     this._excludedFolderListSection = contents.createChild("div", "section excluded-folders-section");
     this._excludedFolderListContainer = this._excludedFolderListSection.createChild("div", "settings-list-container");
-    var excludedFolderEntries = WebInspector.isolatedFileSystemManager.excludedFolderManager().excludedFolders(fileSystemPath);
 
     this._excludedFolderList = new WebInspector.EditableSettingsList([pathColumn], this._excludedFolderValueProvider.bind(this), this._excludedFolderValidate.bind(this), this._excludedFolderEdit.bind(this));
     this._excludedFolderList.addEventListener(WebInspector.SettingsList.Events.Removed, this._excludedFolderRemovedfromList.bind(this));
     this._excludedFolderList.element.classList.add("excluded-folders-list");
     this._excludedFolderListContainer.appendChild(this._excludedFolderList.element);
-    this._excludedFolderEntries = new Map();
-    for (var i = 0; i < excludedFolderEntries.length; ++i)
-        this._addExcludedFolderRow(excludedFolderEntries[i]);
+    /** @type {!Set<string>} */
+    this._excludedFolderEntries = new Set();
+    var excludedFolders = WebInspector.isolatedFileSystemManager.fileSystem(fileSystemPath).excludedFolders();
+    for (var i = 0; i < excludedFolders.length; ++i)
+        this._addExcludedFolderRow(excludedFolders[i]);
 
     this.element.tabIndex = 0;
     this._hasMappingChanges = false;
 }
 
 WebInspector.EditFileSystemDialog.show = function(fileSystemPath)
 {
     var dialog = new WebInspector.EditFileSystemDialog(fileSystemPath);
     WebInspector.Dialog.show(dialog);
     var glassPane = dialog.element.ownerDocument.getElementById("glass-pane");
@@ skipping 172 matching lines @@
         var fileSystemPath = entry.fileSystemPath;
         var urlPrefix = entry.urlPrefix;
         if (!this._fileSystemPath || this._fileSystemPath !== fileSystemPath)
             return;
 
         this._entries[urlPrefix] = entry;
         this._fileMappingsList.addItem(urlPrefix, null);
         this._resize();
     },
 
+    /**
+     * @param {!WebInspector.Event} event
+     */
     _excludedFolderAdded: function(event)
     {
-        var entry = /** @type {!WebInspector.ExcludedFolderManager.Entry} */ (event.data);
-        this._addExcludedFolderRow(entry);
-    },
-
-    _excludedFolderRemoved: function(event)
-    {
-        var entry = /** @type {!WebInspector.ExcludedFolderManager.Entry} */ (event.data);
-        var fileSystemPath = entry.fileSystemPath;
-        if (!fileSystemPath || this._fileSystemPath !== fileSystemPath)
-            return;
-        delete this._excludedFolderEntries[entry.path];
-        if (this._excludedFolderList.itemForId(entry.path))
-            this._excludedFolderList.removeItem(entry.path);
+        var path = /** @type {string} */ (event.data);
+        this._addExcludedFolderRow(path);
     },
 
     /**
+     * @param {!WebInspector.Event} event
+     */
+    _excludedFolderRemoved: function(event)
+    {
+        var path = /** @type {string} */ (event.data);
+        delete this._excludedFolderEntries[path];
+        if (this._excludedFolderList.itemForId(path))
+            this._excludedFolderList.removeItem(path);
+    },
+
+    /**
      * @param {string} itemId
      * @param {string} columnId
      * @return {string}
      */
     _excludedFolderValueProvider: function(itemId, columnId)
     {
         return itemId;
     },
 
     /**
@@ skipping 17 matching lines @@
     {
         return !!path && (path === allowedPath || !this._excludedFolderEntries.has(path));
     },
 
     /**
      * @param {?string} itemId
      * @param {!Object} data
      */
     _excludedFolderEdit: function(itemId, data)
     {
-        var fileSystemPath = this._fileSystemPath;
         if (itemId)
-            WebInspector.isolatedFileSystemManager.excludedFolderManager().removeExcludedFolder(fileSystemPath, itemId);
+            WebInspector.isolatedFileSystemManager.fileSystem(this._fileSystemPath).removeExcludedFolder(itemId);
         var excludedFolderPath = data["path"];
-        WebInspector.isolatedFileSystemManager.excludedFolderManager().addExcludedFolder(fileSystemPath, excludedFolderPath);
+        WebInspector.isolatedFileSystemManager.fileSystem(this._fileSystemPath).addExcludedFolder(excludedFolderPath);
     },
 
     /**
      * @param {!WebInspector.Event} event
      */
     _excludedFolderRemovedfromList: function(event)
     {
         var itemId = /** @type{?string} */ (event.data);
         if (!itemId)
             return;
-        WebInspector.isolatedFileSystemManager.excludedFolderManager().removeExcludedFolder(this._fileSystemPath, itemId);
+        WebInspector.isolatedFileSystemManager.fileSystem(this._fileSystemPath).removeExcludedFolder(itemId);
     },
 
     /**
-     * @param {!WebInspector.ExcludedFolderManager.Entry} entry
+     * @param {string} path
      */
-    _addExcludedFolderRow: function(entry)
+    _addExcludedFolderRow: function(path)
     {
-        var fileSystemPath = entry.fileSystemPath;
-        if (!fileSystemPath || this._fileSystemPath !== fileSystemPath)
-            return;
-        var path = entry.path;
-        this._excludedFolderEntries.set(path, entry);
+        this._excludedFolderEntries.add(path);
         this._excludedFolderList.addItem(path, null);
         this._resize();
     },
 
     /**
      * @param {string} value
      * @param {?string} allowedPrefix
      * @return {boolean}
      */
     _checkURLPrefix: function(value, allowedPrefix)
@@ skipping 31 matching lines @@
     {
         WebInspector.Dialog.hide();
     },
 
     onEnter: function()
     {
     },
 
     __proto__: WebInspector.DialogDelegate.prototype
 }