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

8 files changed, 55 insertions, 55 deletions

diff --git a/templates/part.addnew.php b/templates/part.addnew.php
index 5e921c306..d1253f9b6 100644
--- a/templates/part.addnew.php
+++ b/templates/part.addnew.php
@@ -47,7 +47,7 @@
 						title="<?php p($l->t('Folder')); ?>"		
 						ng-model="folderId"
 						ng-disabled="isAddingFolder()"
-						ng-options="folder.name for folder in folderBl.getAll()"
+						ng-options="folder.name for folder in folderBusinessLayer.getAll()"
 						ng-hide="addNewFolder">
 					<option value="" selected="selected"><?php p($l->t('Choose folder')); ?></option>
 				</select>
diff --git a/templates/part.feed.starred.php b/templates/part.feed.starred.php
index e3c787b65..24258b272 100644
--- a/templates/part.feed.starred.php
+++ b/templates/part.feed.starred.php
@@ -1,17 +1,17 @@
 <li ng-class="{	
-		active: starredBl.isActive(0), 
-		unread: starredBl.getUnreadCount() > 0
+		active: starredBusinessLayer.isActive(0), 
+		unread: starredBusinessLayer.getUnreadCount() > 0
 	}" 
-	ng-show="starredBl.isVisible(0)"
+	ng-show="starredBusinessLayer.isVisible(0)"
 	class="starred">
 	<a class="starred-icon"
 		href="#"
-		ng-click="starredBl.load(0)">
+		ng-click="starredBusinessLayer.load(0)">
 	   <?php p($l->t('Starred')) ?>
 	</a>
 	<span class="utils">
 		<span class="unread-counter">
-			{{ starredBl.getUnreadCount() }}
+			{{ starredBusinessLayer.getUnreadCount() }}
 		</span>
 	</span>
 </li>
\ No newline at end of file
diff --git a/templates/part.feed.unread.php b/templates/part.feed.unread.php
index 67c57e369..03ec2754d 100644
--- a/templates/part.feed.unread.php
+++ b/templates/part.feed.unread.php
@@ -1,26 +1,26 @@
 <li ng-class="{
-		active: subscriptionsBl.isActive(0),
-		unread: subscriptionsBl.getUnreadCount(0) > 0
+		active: subscriptionsBusinessLayer.isActive(0),
+		unread: subscriptionsBusinessLayer.getUnreadCount(0) > 0
 	}" 
-	ng-show="subscriptionsBl.isVisible(0)">
+	ng-show="subscriptionsBusinessLayer.isVisible(0)">
 	<a class="rss-icon" 
 	   href="#" 
-	   ui-if="!feedBl.isShowAll()"
-	   ng-click="subscriptionsBl.load(0)">
+	   ui-if="!feedBusinessLayer.isShowAll()"
+	   ng-click="subscriptionsBusinessLayer.load(0)">
 	   <?php p($l->t('Unread articles'))?>
 	</a>
 		<a class="rss-icon" 
 	   href="#" 
-	   ui-if="feedBl.isShowAll()"
-	   ng-click="subscriptionsBl.load(0)">
+	   ui-if="feedBusinessLayer.isShowAll()"
+	   ng-click="subscriptionsBusinessLayer.load(0)">
 	   <?php p($l->t('All articles'))?>
 	</a>
 	<span class="utils">
 		<span class="unread-counter">
-			{{ subscriptionsBl.getUnreadCount() }}
+			{{ subscriptionsBusinessLayer.getUnreadCount() }}
 		</span>
 		<button class="svg action mark-read-icon" 
-			ng-click="subscriptionsBl.markAllRead()"
+			ng-click="subscriptionsBusinessLayer.markAllRead()"
 			title="<?php p($l->t('Mark all read')) ?>"></button>
 	</span>
 </li>
\ No newline at end of file
diff --git a/templates/part.items.php b/templates/part.items.php
index be3e4975e..79b3457d5 100644
--- a/templates/part.items.php
+++ b/templates/part.items.php
@@ -1,6 +1,6 @@
 <ul>
 	<li class="feed_item"
-		ng-repeat="item in itemBl.getAll() | orderBy:'id':true "
+		ng-repeat="item in itemBusinessLayer.getAll() | orderBy:'id':true "
 		ng-class="{ read: item.isRead() }"
 		data-id="{{ item.id }}"
     	data-feed="{{ item.feedId }}">
@@ -13,7 +13,7 @@
 		<div class="utils">
 			<ul class="primary_item_utils">
 				<li ng-class="{ important: item.isStarred() }"
-					ng-click="itemBl.toggleStarred(item.id)"
+					ng-click="itemBusinessLayer.toggleStarred(item.id)"
 					class="star" 
 					title="<?php p($l->t('Save for later')) ?>">
 				</li>
@@ -21,15 +21,15 @@
 		</div>
 
 		<h1 class="item_title">
-			<a ng-click="itemBl.setRead(item.id)" 
+			<a ng-click="itemBusinessLayer.setRead(item.id)" 
 				target="_blank" href="{{ item.url }}">{{ item.title }}</a>
 		</h1>
 
 		<h2 class="item_author">
-			<span ng-show="itemBl.noFeedActive() && feedBl.getFeedLink(item.feedId)">
+			<span ng-show="itemBusinessLayer.noFeedActive() && feedBusinessLayer.getFeedLink(item.feedId)">
 				<?php p($l->t('from')) ?>
-				<a 	target="_blank" href="{{ feedBl.getFeedLink(item.feedId) }}"
-					class="from_feed">{{ itemBl.getFeedTitle(item.id) }}</a> 
+				<a 	target="_blank" href="{{ feedBusinessLayer.getFeedLink(item.feedId) }}"
+					class="from_feed">{{ itemBusinessLayer.getFeedTitle(item.id) }}</a> 
 			</span>
 			<span ui-if="item.author">
 				<?php p($l->t('by')) ?>
@@ -45,16 +45,16 @@
 		</div>
 		
 		<div class="body" 
-				ng-click="itemBl.setRead(item.id)" 
+				ng-click="itemBusinessLayer.setRead(item.id)" 
 				ng-bind-html-unsafe="item.body">
 		</div>
 
 		<div class="bottom_utils">
 			<ul class="secondary_item_utils"
-				ng-class="{ show_keep_unread: itemBl.isKeptUnread(item.id) }">
-				<li ng-click="itemBl.toggleKeepUnread(item.id)" 
+				ng-class="{ show_keep_unread: itemBusinessLayer.isKeptUnread(item.id) }">
+				<li ng-click="itemBusinessLayer.toggleKeepUnread(item.id)" 
 					class="keep_unread"><?php p($l->t('Keep unread')); ?>
-					<input type="checkbox" ng-checked="itemBl.isKeptUnread(item.id)"/>
+					<input type="checkbox" ng-checked="itemBusinessLayer.isKeptUnread(item.id)"/>
 				</li>
 			</ul>
 		</div>
diff --git a/templates/part.listfeed.php b/templates/part.listfeed.php
index 94fcb997b..550b437fd 100644
--- a/templates/part.listfeed.php
+++ b/templates/part.listfeed.php
@@ -1,10 +1,10 @@
 <li ng-class="{
-		active: feedBl.isActive(feed.id), 
-		unread: feedBl.getUnreadCount(feed.id) > 0,
+		active: feedBusinessLayer.isActive(feed.id), 
+		unread: feedBusinessLayer.getUnreadCount(feed.id) > 0,
 		failed: feed.error
 	}" 
-	ng-repeat="feed in feedBl.getFeedsOfFolder(<?php p($_['folderId']); ?>)"
-	ng-show="feedBl.isVisible(feed.id) || !feed.id"
+	ng-repeat="feed in feedBusinessLayer.getFeedsOfFolder(<?php p($_['folderId']); ?>)"
+	ng-show="feedBusinessLayer.isVisible(feed.id) || !feed.id"
 	data-id="{{ feed.id }}"
 	class="feed"
 	oc-draggable="{
@@ -15,7 +15,7 @@
 		helper: 'clone'
 	}">
 	<a 	ng-style="{ backgroundImage: feed.faviconLink }"
-		ng-click="feedBl.load(feed.id)"
+		ng-click="feedBusinessLayer.load(feed.id)"
 		ng-class="{
 			'progress-icon': !feed.id,
 			'problem-icon': feed.error
@@ -30,21 +30,21 @@
 
 		<span class="unread-counter" 
 			ng-show="feed.id">
-			{{ feedBl.getUnreadCount(feed.id) }}
+			{{ feedBusinessLayer.getUnreadCount(feed.id) }}
 		</span>
 
 		<button class="svg action mark-read-icon"
-			ng-show="feedBl.getUnreadCount(feed.id) > 0 && feed.id"
-			ng-click="feedBl.markFeedRead(feed.id)"
+			ng-show="feedBusinessLayer.getUnreadCount(feed.id) > 0 && feed.id"
+			ng-click="feedBusinessLayer.markFeedRead(feed.id)"
 			title="<?php p($l->t('Mark all read')); ?>"> </button>
 		
-		<button ng-click="feedBl.delete(feed.id)"
+		<button ng-click="feedBusinessLayer.delete(feed.id)"
 			class="svg action delete-icon" 
 			title="<?php p($l->t('Delete feed')); ?>"
 			ng-show="feed.id"></button>
 
 		<button class="svg action delete-icon"
-			ng-click="feedBl.markErrorRead(feed.urlHash)"
+			ng-click="feedBusinessLayer.markErrorRead(feed.urlHash)"
 			title="<?php p($l->t('Delete website')); ?>"
 			ng-show="feed.error"></button>
 	</span>
diff --git a/templates/part.listfolder.php b/templates/part.listfolder.php
index 141118d69..0b986e12b 100644
--- a/templates/part.listfolder.php
+++ b/templates/part.listfolder.php
@@ -1,21 +1,21 @@
 <li ng-class="{
-		active: folderBl.isActive(folder.id), 
-		open: folder.opened && folderBl.hasFeeds(folder.id),
-		collapsible: folderBl.hasFeeds(folder.id),
-		unread: folderBl.getUnreadCount(folder.id) != 0,
+		active: folderBusinessLayer.isActive(folder.id), 
+		open: folder.opened && folderBusinessLayer.hasFeeds(folder.id),
+		collapsible: folderBusinessLayer.hasFeeds(folder.id),
+		unread: folderBusinessLayer.getUnreadCount(folder.id) != 0,
 		failed: folder.error
 	}" 
-	ng-repeat="folder in folderBl.getAll()"
-	ng-show="folderBl.isVisible(folder.id) || !folder.id"
+	ng-repeat="folder in folderBusinessLayer.getAll()"
+	ng-show="folderBusinessLayer.isVisible(folder.id) || !folder.id"
 	class="folder"
 	data-id="{{ folder.id }}"
 	droppable>
 	<button class="collapse" 
 			title="<?php p($l->t('Collapse'));?>"
-			ng-click="folderBl.toggleFolder(folder.id)"></button>
+			ng-click="folderBusinessLayer.toggleFolder(folder.id)"></button>
 	<a href="#" 
 	   class="title folder-icon"
-	   ng-click="folderBl.load(folder.id)"
+	   ng-click="folderBusinessLayer.load(folder.id)"
 	   ng-class="{
 			'progress-icon': !folder.id,
 			'problem-icon': folder.error
@@ -25,22 +25,22 @@
 
 	<span class="utils">
 
-		<button ng-click="folderBl.delete(folder.id)"
-				ng-hide="folderBl.hasFeeds(folder.id) || !folder.id"
+		<button ng-click="folderBusinessLayer.delete(folder.id)"
+				ng-hide="folderBusinessLayer.hasFeeds(folder.id) || !folder.id"
 				class="svg action delete-icon" 
 				title="<?php p($l->t('Delete folder')); ?>"></button>
 
 		<span class="unread-counter">
-			{{ folderBl.getUnreadCount(folder.id) }}
+			{{ folderBusinessLayer.getUnreadCount(folder.id) }}
 		</span>
 		
 		<button class="svg action mark-read-icon" 
-				ng-show="folderBl.getUnreadCount(folder.id) > 0 && folder.id"
-				ng-click="folderBl.markFolderRead(folder.id)"
+				ng-show="folderBusinessLayer.getUnreadCount(folder.id) > 0 && folder.id"
+				ng-click="folderBusinessLayer.markFolderRead(folder.id)"
 				title="<?php p($l->t('Mark all read')); ?>"></button>
 
 		<button class="svg action delete-icon"
-			ng-click="folderBl.markErrorRead(folder.name)"
+			ng-click="folderBusinessLayer.markErrorRead(folder.name)"
 			title="<?php p($l->t('Delete folder')); ?>"
 			ng-show="folder.error"></button>
 
diff --git a/templates/part.settings.php b/templates/part.settings.php
index ab1876104..dd3f0378c 100644
--- a/templates/part.settings.php
+++ b/templates/part.settings.php
@@ -23,12 +23,12 @@
 		<a title="<?php p($l->t('Export')); ?>" class="button"
 			href="<?php p(\OCP\Util::linkToRoute('news_export_opml')); ?>" 
 			target="_blank"
-			ng-show="feedBl.getNumberOfFeeds() > 0">
+			ng-show="feedBusinessLayer.getNumberOfFeeds() > 0">
 			<?php p($l->t('Export')); ?>
 		</a>
 		<button
 			title="<?php p($l->t('Export')); ?>" 
-			ng-hide="feedBl.getNumberOfFeeds() > 0" disabled>
+			ng-hide="feedBusinessLayer.getNumberOfFeeds() > 0" disabled>
 			<?php p($l->t('Export')); ?>
 		</button>
 
diff --git a/templates/part.showall.php b/templates/part.showall.php
index 404950986..331293987 100644
--- a/templates/part.showall.php
+++ b/templates/part.showall.php
@@ -1,7 +1,7 @@
-<li ui-if="!feedBl.isShowAll() && feedBl.getNumberOfFeeds() > 0" class="show-all">
-	<a ng-click="feedBl.setShowAll(true)" href="#"><?php p($l->t('Show all')); ?></a>
+<li ui-if="!feedBusinessLayer.isShowAll() && feedBusinessLayer.getNumberOfFeeds() > 0" class="show-all">
+	<a ng-click="feedBusinessLayer.setShowAll(true)" href="#"><?php p($l->t('Show all')); ?></a>
 </li>
 
-<li ui-if="feedBl.isShowAll() && feedBl.getNumberOfFeeds() > 0" class="show-all">
-	<a ng-click="feedBl.setShowAll(false)" href="#"><?php p($l->t('Show only unread')); ?></a>
+<li ui-if="feedBusinessLayer.isShowAll() && feedBusinessLayer.getNumberOfFeeds() > 0" class="show-all">
+	<a ng-click="feedBusinessLayer.setShowAll(false)" href="#"><?php p($l->t('Show only unread')); ?></a>
 </li>