DevTools: merge uisourcecode's url-alike members.

third_party/WebKit/Source/devtools/front_end/workspace/UISourceCode.js

 /*
  * Copyright (C) 2011 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 22 matching lines @@
  * @constructor
  * @extends {WebInspector.Object}
  * @implements {WebInspector.ContentProvider}
  * @param {!WebInspector.Project} project
  * @param {string} url
  * @param {!WebInspector.ResourceType} contentType
  */
 WebInspector.UISourceCode = function(project, url, contentType)
 {
     this._project = project;
-    this._path = url;
-    this._originURL = url;
+    this._url = url;
 
     var pathComponents = WebInspector.ParsedURL.splitURLIntoPathComponents(url);
-    this._host = pathComponents[0];
-    this._parentPath = pathComponents.slice(0, -1).join("/");
+    this._origin = pathComponents[0];
+    this._parentURL = pathComponents.slice(0, -1).join("/");
     this._name = pathComponents[pathComponents.length - 1];
 
     this._contentType = contentType;
     /** @type {!Array.<function(?string)>} */
     this._requestContentCallbacks = [];
 
     /** @type {!Array.<!WebInspector.Revision>} */
     this.history = [];
     this._hasUnsavedCommittedChanges = false;
 
@@ skipping 10 matching lines @@
     TitleChanged: "TitleChanged",
     SourceMappingChanged: "SourceMappingChanged",
     MessageAdded: "MessageAdded",
     MessageRemoved: "MessageRemoved",
 }
 
 WebInspector.UISourceCode.prototype = {
     /**
      * @return {string}
      */
-    path: function()
-    {
-        return this._path;
-    },
-
-    /**
-     * @return {string}
-     */
     name: function()
     {
         return this._name;
     },
 
     /**
      * @return {string}
      */
-    parentPath: function()
+    url: function()
     {
-        return this._parentPath;
+        return this._url;
     },
 
     /**
      * @return {string}
      */
-    host: function()
+    parentURL: function()
     {
-        return this._host;
+        return this._parentURL;
     },
 
     /**
+     * @return {string}
+     */
+    origin: function()
+    {
+        return this._origin;
+    },
+
+    /**
      * @return {string}
      */
     fullDisplayName: function()
     {
-        return this._parentPath.replace(/^(?:https?|file)\:\/\//, "") + "/" + this.displayName(true);
+        return this._parentURL.replace(/^(?:https?|file)\:\/\//, "") + "/" + this.displayName(true);
     },
 
     /**
      * @param {boolean=} skipTrim
      * @return {string}
      */
     displayName: function(skipTrim)
     {
         var displayName = this.name() || WebInspector.UIString("(index)");
         return skipTrim ? displayName : displayName.trimEnd(100);
     },
 
     /**
-     * @return {string}
-     */
-    uri: function()
-    {
-        return this._path;
-    },
-
-    /**
-     * @return {string}
-     */
-    originURL: function()
-    {
-        return this._originURL;
-    },
-
-    /**
      * @return {boolean}
      */
     isFromServiceProject: function()
     {
         return WebInspector.Project.isServiceProject(this._project);
     },
 
     /**
      * @return {boolean}
      */
     canRename: function()
     {
         return this._project.canRename();
     },
 
     /**
      * @param {string} newName
      * @param {function(boolean)} callback
      */
     rename: function(newName, callback)
     {
         this._project.rename(this, newName, innerCallback.bind(this));
 
         /**
          * @param {boolean} success
          * @param {string=} newName
-         * @param {string=} newOriginURL
+         * @param {string=} newURL
          * @param {!WebInspector.ResourceType=} newContentType
          * @this {WebInspector.UISourceCode}
          */
-        function innerCallback(success, newName, newOriginURL, newContentType)
+        function innerCallback(success, newName, newURL, newContentType)
         {
             if (success)
-                this._updateName(/** @type {string} */ (newName), /** @type {string} */ (newOriginURL), /** @type {!WebInspector.ResourceType} */ (newContentType));
+                this._updateName(/** @type {string} */ (newName), /** @type {string} */ (newURL), /** @type {!WebInspector.ResourceType} */ (newContentType));
             callback(success);
         }
     },
 
     remove: function()
     {
-        this._project.deleteFile(this.path());
+        this._project.deleteFile(this.url());
     },
 
     /**
      * @param {string} name
-     * @param {string} originURL
+     * @param {string} url
      * @param {!WebInspector.ResourceType=} contentType
      */
-    _updateName: function(name, originURL, contentType)
+    _updateName: function(name, url, contentType)
     {
-        var oldURI = this.uri();
-        this._path = this._path.substring(0, this._path.length - this._name.length) + name;
+        var oldURД = this.url();
+        this._url = this._url.substring(0, this._url.length - this._name.length) + name;
         this._name = name;
-        if (originURL)
-            this._originURL = originURL;
+        if (url)
+            this._url = url;
         if (contentType)
             this._contentType = contentType;
-        this.dispatchEventToListeners(WebInspector.UISourceCode.Events.TitleChanged, oldURI);
+        this.dispatchEventToListeners(WebInspector.UISourceCode.Events.TitleChanged, oldURД);
     },
 
     /**
      * @override
      * @return {string}
      */
     contentURL: function()
     {
-        return this.originURL();
+        return this.url();
     },
 
     /**
      * @override
      * @return {!WebInspector.ResourceType}
      */
     contentType: function()
     {
         return this._contentType;
     },
@@ skipping 129 matching lines @@
      * @param {string} content
      */
     _commitContent: function(content)
     {
         var wasPersisted = false;
         if (this._project.canSetFileContent()) {
             this._project.setFileContent(this, content, function() { });
             wasPersisted = true;
         } else if (this._project.workspace().hasResourceContentTrackingExtensions()) {
             wasPersisted = true;
-        } else if (this._originURL && WebInspector.fileManager.isURLSaved(this._originURL)) {
-            WebInspector.fileManager.save(this._originURL, content, false, function() { });
-            WebInspector.fileManager.close(this._originURL);
+        } else if (this._url && WebInspector.fileManager.isURLSaved(this._url)) {
+            WebInspector.fileManager.save(this._url, content, false, function() { });
+            WebInspector.fileManager.close(this._url);
             wasPersisted = true;
         }
         this._contentCommitted(content, wasPersisted, true);
     },
 
     /**
      * @param {string} content
      * @param {boolean} wasPersisted
      * @param {boolean} committedByUser
      */
@@ skipping 12 matching lines @@
         this._innerResetWorkingCopy();
         this._hasUnsavedCommittedChanges = !wasPersisted;
         this.dispatchEventToListeners(WebInspector.UISourceCode.Events.WorkingCopyCommitted);
         this._project.workspace().dispatchEventToListeners(WebInspector.Workspace.Events.WorkingCopyCommitted, { uiSourceCode: this, content: content });
         if (committedByUser)
             this._project.workspace().dispatchEventToListeners(WebInspector.Workspace.Events.WorkingCopyCommittedByUser, { uiSourceCode: this, content: content });
     },
 
     saveAs: function()
     {
-        WebInspector.fileManager.save(this._originURL, this.workingCopy(), true, callback.bind(this));
-        WebInspector.fileManager.close(this._originURL);
+        WebInspector.fileManager.save(this._url, this.workingCopy(), true, callback.bind(this));
+        WebInspector.fileManager.close(this._url);
 
         /**
          * @param {boolean} accepted
          * @this {WebInspector.UISourceCode}
          */
         function callback(accepted)
         {
             if (accepted)
                 this._contentCommitted(this.workingCopy(), true, true);
         }
@@ skipping 267 matching lines @@
         if (typeof this.lineNumber === "number")
             linkText += ":" + (this.lineNumber + 1);
         return linkText;
     },
 
     /**
      * @return {string}
      */
     id: function()
     {
-        return this.uiSourceCode.project().id() + ":" + this.uiSourceCode.uri() + ":" + this.lineNumber + ":" + this.columnNumber;
+        return this.uiSourceCode.project().id() + ":" + this.uiSourceCode.url() + ":" + this.lineNumber + ":" + this.columnNumber;
     },
 
     /**
      * @return {string}
      */
     toUIString: function()
     {
-        return this.uiSourceCode.uri() + ":" + (this.lineNumber + 1);
+        return this.uiSourceCode.url() + ":" + (this.lineNumber + 1);
     }
 }
 
 /**
  * @constructor
  * @implements {WebInspector.ContentProvider}
  * @param {!WebInspector.UISourceCode} uiSourceCode
  * @param {?string|undefined} content
  * @param {!Date} timestamp
  */
@@ skipping 43 matching lines @@
         WebInspector.userMetrics.actionTaken(WebInspector.UserMetrics.Action.RevisionApplied);
         this.requestContent(revert.bind(this));
     },
 
     /**
      * @override
      * @return {string}
      */
     contentURL: function()
     {
-        return this._uiSourceCode.originURL();
+        return this._uiSourceCode.url();
     },
 
     /**
      * @override
      * @return {!WebInspector.ResourceType}
      */
     contentType: function()
     {
         return this._uiSourceCode.contentType();
     },
@@ skipping 98 matching lines @@
     isEqual: function(another)
     {
         return this._uiSourceCode === another._uiSourceCode && this.text() === another.text() && this.level() === another.level() && this.range().equal(another.range());
     },
 
     remove: function()
     {
         this._uiSourceCode.removeMessage(this);
     }
 }