renamed bl to businesslayer, handle exception in update routine, fix #69

3 files changed, 35 insertions, 30 deletions

diff --git a/js/app/controllers/feedcontroller.coffee b/js/app/controllers/feedcontroller.coffee
index e9171a455..3d8755cad 100644
--- a/js/app/controllers/feedcontroller.coffee
+++ b/js/app/controllers/feedcontroller.coffee
@@ -22,25 +22,27 @@ License along with this library.  If not, see <http://www.gnu.org/licenses/>.
 
 
 angular.module('News').controller 'FeedController',
-['$scope', '_ExistsError', 'Persistence', 'FolderBl', 'FeedBl',
-'SubscriptionsBl', 'StarredBl', 'unreadCountFormatter',
-($scope, _ExistsError, Persistence, FolderBl, FeedBl, SubscriptionsBl,
-StarredBl, unreadCountFormatter) ->
+['$scope', '_ExistsError', 'Persistence', 'FolderBusinessLayer',
+'FeedBusinessLayer', 'SubscriptionsBusinessLayer', 'StarredBusinessLayer',
+'unreadCountFormatter',
+($scope, _ExistsError, Persistence, FolderBusinessLayer, FeedBusinessLayer,
+SubscriptionsBusinessLayer, StarredBusinessLayer, unreadCountFormatter) ->
 
 
 	class FeedController
 
-		constructor: (@_$scope, @_persistence, @_folderBl, @_feedBl,
-		              @_subscriptionsBl, @_starredBl, @_unreadCountFormatter) ->
+		constructor: (@_$scope, @_persistence, @_folderBusinessLayer,
+		              @_feedBusinessLayer, @_subscriptionsBusinessLayer,
+		              @_starredBusinessLayer, @_unreadCountFormatter) ->
 
 			@_isAddingFolder = false
 			@_isAddingFeed = false
 
 			# bind internal stuff to scope
-			@_$scope.folderBl = @_folderBl
-			@_$scope.feedBl = @_feedBl
-			@_$scope.subscriptionsBl = @_subscriptionsBl
-			@_$scope.starredBl = @_starredBl
+			@_$scope.folderBusinessLayer = @_folderBusinessLayer
+			@_$scope.feedBusinessLayer = @_feedBusinessLayer
+			@_$scope.subscriptionsBusinessLayer = @_subscriptionsBusinessLayer
+			@_$scope.starredBusinessLayer = @_starredBusinessLayer
 			@_$scope.unreadCountFormatter = @_unreadCountFormatter
 
 			
@@ -58,13 +60,13 @@ StarredBl, unreadCountFormatter) ->
 					@_isAddingFeed = true
 					# set folder to open
 					if parentFolderId != 0
-						@_folderBl.open(parentFolderId)
-					@_feedBl.create feedUrl, parentFolderId
+						@_folderBusinessLayer.open(parentFolderId)
+					@_feedBusinessLayer.create feedUrl, parentFolderId
 					# on success
 					, (data) =>
 						@_$scope.feedUrl = ''
 						@_isAddingFeed = false
-						@_feedBl.load(data['feeds'][0].id)
+						@_feedBusinessLayer.load(data['feeds'][0].id)
 					# on error
 					, =>
 						@_isAddingFeed = false
@@ -83,7 +85,7 @@ StarredBl, unreadCountFormatter) ->
 
 				try
 					@_isAddingFolder = true
-					@_folderBl.create folderName
+					@_folderBusinessLayer.create folderName
 
 					# on success
 					, (data) =>
@@ -91,7 +93,7 @@ StarredBl, unreadCountFormatter) ->
 						@_$scope.addNewFolder = false
 						@_isAddingFolder = false
 						activeId = data['folders'][0].id
-						@_$scope.folderId = @_folderBl.getById(activeId)
+						@_$scope.folderId = @_folderBusinessLayer.getById(activeId)
 					# on error
 					, =>
 						@_isAddingFolder = false
@@ -106,10 +108,11 @@ StarredBl, unreadCountFormatter) ->
 
 
 			@_$scope.$on 'moveFeedToFolder', (scope, data) =>
-				@_feedBl.move(data.feedId, data.folderId)
+				@_feedBusinessLayer.move(data.feedId, data.folderId)
 
 
-	return new FeedController($scope, Persistence, FolderBl, FeedBl,
-	                           SubscriptionsBl, StarredBl, unreadCountFormatter)
+	return new FeedController($scope, Persistence, FolderBusinessLayer,
+	                          FeedBusinessLayer, SubscriptionsBusinessLayer,
+	                          StarredBusinessLayer, unreadCountFormatter)
 
 ]
\ No newline at end of file
diff --git a/js/app/controllers/itemcontroller.coffee b/js/app/controllers/itemcontroller.coffee
index 52f1c271a..bdc35c855 100644
--- a/js/app/controllers/itemcontroller.coffee
+++ b/js/app/controllers/itemcontroller.coffee
@@ -22,15 +22,17 @@ License along with this library.  If not, see <http://www.gnu.org/licenses/>.
 
 
 angular.module('News').controller 'ItemController',
-['$scope', 'ItemBl', 'FeedModel', 'FeedLoading', 'FeedBl', 'Language',
-($scope, ItemBl, FeedModel, FeedLoading, FeedBl, Language) ->
+['$scope', 'ItemBusinessLayer', 'FeedModel', 'FeedLoading', 'FeedBusinessLayer',
+'Language',
+($scope, ItemBusinessLayer, FeedModel, FeedLoading, FeedBusinessLayer,
+Language) ->
 
 	class ItemController
 
-		constructor: (@_$scope, @_itemBl, @_feedModel, @_feedLoading,
-		              @_feedBl, @_language) ->
-			@_$scope.itemBl = @_itemBl
-			@_$scope.feedBl = @_feedBl
+		constructor: (@_$scope, @_itemBusinessLayer, @_feedModel, @_feedLoading,
+		              @_feedBusinessLayer, @_language) ->
+			@_$scope.itemBusinessLayer = @_itemBusinessLayer
+			@_$scope.feedBusinessLayer = @_feedBusinessLayer
 
 			@_$scope.isLoading = =>
 				return @_feedLoading.isLoading()
@@ -50,6 +52,6 @@ angular.module('News').controller 'ItemController',
 
 
 
-	return new ItemController($scope, ItemBl, FeedModel, FeedLoading, FeedBl,
-	                          Language)
+	return new ItemController($scope, ItemBusinessLayer, FeedModel, FeedLoading,
+	                          FeedBusinessLayer, Language)
 ]
\ No newline at end of file
diff --git a/js/app/controllers/settingscontroller.coffee b/js/app/controllers/settingscontroller.coffee
index 3c6a7771e..a1632a761 100644
--- a/js/app/controllers/settingscontroller.coffee
+++ b/js/app/controllers/settingscontroller.coffee
@@ -22,17 +22,17 @@ License along with this library.  If not, see <http://www.gnu.org/licenses/>.
 
 
 angular.module('News').controller 'SettingsController',
-['$scope', 'FeedBl', 'FolderBl', 'ShowAll',
-($scope, FeedBl, FolderBl, ShowAll) ->
+['$scope', 'FeedBusinessLayer', 'FolderBusinessLayer', 'ShowAll',
+($scope, FeedBusinessLayer, FolderBusinessLayer, ShowAll) ->
 
-	$scope.feedBl = FeedBl
+	$scope.feedBusinessLayer = FeedBusinessLayer
 
 	$scope.import = (fileContent) =>
 		$scope.error = false
 		ShowAll.setShowAll(true)
 
 		try
-			FolderBl.import(fileContent)
+			FolderBusinessLayer.import(fileContent)
 		catch error
 			console.error error
 			$scope.error = true