Merge pull request #1871 from atom/cj-remove-deprecated-calls

Remove deprecated calls

package.json

@@ -66,35 +66,35 @@
     "autocomplete": "0.27.0",
     "autoflow": "0.16.0",
     "autosave": "0.13.0",
-    "background-tips": "0.10.0",
+    "background-tips": "0.12.0",
     "bookmarks": "0.22.0",
-    "bracket-matcher": "0.30.0",
+    "bracket-matcher": "0.31.0",
     "command-palette": "0.20.0",
     "dev-live-reload": "0.30.0",
     "exception-reporting": "0.17.0",
     "feedback": "0.30.0",
-    "find-and-replace": "0.97.0",
-    "fuzzy-finder": "0.49.0",
+    "find-and-replace": "0.98.0",
+    "fuzzy-finder": "0.50.0",
     "git-diff": "0.28.0",
     "go-to-line": "0.19.0",
     "grammar-selector": "0.24.0",
-    "image-view": "0.32.0",
+    "image-view": "0.33.0",
     "keybinding-resolver": "0.17.0",
     "link": "0.22.0",
     "markdown-preview": "0.62.0",
     "metrics": "0.32.0",
     "open-on-github": "0.28.0",
     "package-generator": "0.30.0",
-    "release-notes": "0.26.0",
-    "settings-view": "0.107.0",
-    "snippets": "0.40.0",
+    "release-notes": "0.27.0",
+    "settings-view": "0.108.0",
+    "snippets": "0.41.0",
     "spell-check": "0.33.0",
-    "status-bar": "0.39.0",
-    "styleguide": "0.28.0",
+    "status-bar": "0.40.0",
+    "styleguide": "0.29.0",
     "symbols-view": "0.49.0",
-    "tabs": "0.34.0",
-    "timecop": "0.17.0",
-    "tree-view": "0.89.0",
+    "tabs": "0.36.0",
+    "timecop": "0.18.0",
+    "tree-view": "0.90.0",
     "update-package-dependencies": "0.6.0",
     "welcome": "0.12.0",
     "whitespace": "0.22.0",

src/pane-container-view.coffee

@@ -81,6 +81,10 @@ class PaneContainerView extends View
     @find('.pane:has(:focus)').view()
 
   getActivePane: ->
+    deprecate("Use PaneContainerView::getActivePaneView instead.")
+    @getActivePaneView()
+
+  getActivePaneView: ->
     @viewForModel(@model.activePane)
 
   getActivePaneItem: ->

src/pane-container.coffee

@@ -39,6 +39,9 @@ class PaneContainer extends Model
   getPanes: ->
     @root?.getPanes() ? []
 
+  getActivePane: ->
+    @activePane
+
   paneForUri: (uri) ->
     find @getPanes(), (pane) -> pane.itemForUri(uri)?
 

src/workspace-view.coffee

@@ -151,7 +151,7 @@ class WorkspaceView extends View
 
     @command 'pane:reopen-closed-item', => @reopenItemSync()
 
-    @command 'core:close', => if @getActivePaneItem()? then @destroyActivePaneItem() else @destroyActivePane()
+    @command 'core:close', => if @getModel().getActivePaneItem()? then @destroyActivePaneItem() else @destroyActivePane()
     @command 'core:save', => @saveActivePaneItem()
     @command 'core:save-as', => @saveActivePaneItemAs()
 
@@ -182,8 +182,8 @@ class WorkspaceView extends View
               detailedMessage: "The shell commands `atom` and `apm` are installed."
 
   handleFocus: ->
-    if @getActivePane()
-      @getActivePane().focus()
+    if @getActivePaneView()
+      @getActivePaneView().focus()
       false
     else
       @updateTitle()
@@ -205,7 +205,7 @@ class WorkspaceView extends View
   # Updates the application's title, based on whichever file is open.
   updateTitle: ->
     if projectPath = atom.project.getPath()
-      if item = @getActivePaneItem()
+      if item = @getModel().getActivePaneItem()
         @setTitle("#{item.getTitle?() ? 'untitled'} - #{projectPath}")
       else
         @setTitle(projectPath)
@@ -272,7 +272,7 @@ class WorkspaceView extends View
   #
   # Returns a {PaneView}.
   getActivePaneView: ->
-    @panes.getActivePane()
+    @panes.getActivePaneView()
 
   # Public: Get the view associated with the active pane item.
   #
@@ -316,7 +316,7 @@ class WorkspaceView extends View
   #
   # Returns an Array of all open {PaneView}s.
   getPaneViews: ->
-    @panes.getPanes()
+    @panes.getPaneViews()
 
   # Public: Register a function to be called for every current and future
   # editor view in the workspace.

src/workspace.coffee

@@ -223,6 +223,12 @@ class Workspace extends Model
   paneForUri: (uri) ->
     @paneContainer.paneForUri(uri)
 
+  # Public: Get the active {Pane}'s active item.
+  #
+  # Returns an pane item {Object}.
+  getActivePaneItem: ->
+    @paneContainer.getActivePane().getActiveItem()
+
   # Public: Save the active pane item.
   #
   # If the active pane item currently has a URI according to the item's