Menu
▾
▴
[Mp-plugins-svn] SF.net SVN: mp-plugins:[4777] trunk/plugins/BrowseTheWeb/Source/ BrowseTheWeb
|
From: <dos...@us...> - 2014-04-01 20:04:59
|
Revision: 4777
http://sourceforge.net/p/mp-plugins/code/4777
Author: doskabouter
Date: 2014-04-01 20:04:56 +0000 (Tue, 01 Apr 2014)
Log Message:
-----------
Refactor Bookmarks.Instance.root to BookmarkFolder
Modified Paths:
--------------
trunk/plugins/BrowseTheWeb/Source/BrowseTheWeb/Bookmarks.cs
trunk/plugins/BrowseTheWeb/Source/BrowseTheWeb/GUIBookmark.cs
trunk/plugins/BrowseTheWeb/Source/BrowseTheWeb/ImportBrowser.cs
trunk/plugins/BrowseTheWeb/Source/BrowseTheWeb/Setup.cs
Modified: trunk/plugins/BrowseTheWeb/Source/BrowseTheWeb/Bookmarks.cs
===================================================================
--- trunk/plugins/BrowseTheWeb/Source/BrowseTheWeb/Bookmarks.cs 2014-03-27 16:17:25 UTC (rev 4776)
+++ trunk/plugins/BrowseTheWeb/Source/BrowseTheWeb/Bookmarks.cs 2014-04-01 20:04:56 UTC (rev 4777)
@@ -23,7 +23,6 @@
#endregion
using System;
-using System.Collections.Generic;
using System.Xml;
using System.IO;
using System.Windows.Forms;
@@ -38,7 +37,7 @@
public class Bookmarks
{
public static string SavedByMp = "Saved by MP";
- public List<BookmarkBase> root;
+ public BookmarkFolder root;
#region singleton
private static Bookmarks instance;
@@ -56,12 +55,13 @@
private Bookmarks()
{
- root = new List<BookmarkBase>();
+ root = new BookmarkFolder();
+ root.Parent = null;
}
public void Clear()
{
- root.Clear();
+ root.Items.Clear();
}
private void LoadOldVersion(XmlDocument doc)
@@ -69,24 +69,24 @@
try
{
- List<BookmarkBase> last = root;
+ BookmarkFolder last = root;
foreach (XmlNode node in doc.DocumentElement.SelectNodes("//Entry"))
{
if (Convert.ToBoolean(node.SelectSingleNode("isFolder").InnerText))
{
BookmarkFolder bmf = new BookmarkFolder();
bmf.FromXml(node);
- last = bmf.Items;
- root.Add(bmf);
+ last = bmf;
+ root.Items.Add(bmf);
}
else
{
BookmarkItem item = new BookmarkItem();
item.FromXml(node);
if (Convert.ToBoolean(node.SelectSingleNode("isSubFolder").InnerText))
- last.Add(item);
+ last.Items.Add(item);
else
- root.Add(item);
+ root.Items.Add(item);
}
}
@@ -97,15 +97,15 @@
}
}
- private void SetParent(List<BookmarkBase> items, BookmarkFolder parent)
+ private void SetParent(BookmarkFolder item)
{
- foreach (BookmarkBase sub in items)
+ foreach (BookmarkBase sub in item.Items)
{
BookmarkFolder bmf = sub as BookmarkFolder;
if (bmf != null)
{
- bmf.Parent = parent;
- SetParent(bmf.Items, bmf);
+ bmf.Parent = item;
+ SetParent(bmf);
}
}
@@ -126,18 +126,16 @@
}
else
{
- BookmarkFolder dummy = new BookmarkFolder();
- dummy.Items = root;
- dummy.FromXml(doc.DocumentElement);
+ root.FromXml(doc.DocumentElement);
}
- SetParent(root, null);
+ SetParent(root);
}
else
{
BookmarkFolder bmf = new BookmarkFolder();
bmf.Name = SavedByMp;
- root.Add(bmf);
+ root.Items.Add(bmf);
}
}
@@ -151,7 +149,7 @@
textWriter.Formatting = Formatting.Indented;
textWriter.WriteStartDocument();
textWriter.WriteStartElement("Bookmarks");
- foreach (BookmarkBase item in root)
+ foreach (BookmarkBase item in root.Items)
{
item.ToXml(textWriter);
}
@@ -170,7 +168,7 @@
public bool AddBookmark(string title, string url, string path)
{
- BookmarkFolder bmf = root.Find(x => x.Name == SavedByMp && x is BookmarkFolder) as BookmarkFolder;
+ BookmarkFolder bmf = root.Items.Find(x => x.Name == SavedByMp && x is BookmarkFolder) as BookmarkFolder;
if (bmf != null)
{
bmf.Items.Add(new BookmarkItem() { Name = title, Url = url });
Modified: trunk/plugins/BrowseTheWeb/Source/BrowseTheWeb/GUIBookmark.cs
===================================================================
--- trunk/plugins/BrowseTheWeb/Source/BrowseTheWeb/GUIBookmark.cs 2014-03-27 16:17:25 UTC (rev 4776)
+++ trunk/plugins/BrowseTheWeb/Source/BrowseTheWeb/GUIBookmark.cs 2014-04-01 20:04:56 UTC (rev 4777)
@@ -23,7 +23,6 @@
#endregion
-using System.Collections.Generic;
using MediaPortal.GUI.Library;
using MediaPortal.Configuration;
@@ -135,9 +134,9 @@
facade.Add(item);
}
- List<BookmarkBase> list = parent == null ? Bookmarks.Instance.root : parent.Items;
+ BookmarkFolder bmf = parent == null ? Bookmarks.Instance.root : parent;
- foreach (BookmarkBase bookmark in list)
+ foreach (BookmarkBase bookmark in bmf.Items)
{
BtwebGuiListItem item = new BtwebGuiListItem();
item.IsFolder = bookmark is BookmarkFolder;
Modified: trunk/plugins/BrowseTheWeb/Source/BrowseTheWeb/ImportBrowser.cs
===================================================================
--- trunk/plugins/BrowseTheWeb/Source/BrowseTheWeb/ImportBrowser.cs 2014-03-27 16:17:25 UTC (rev 4776)
+++ trunk/plugins/BrowseTheWeb/Source/BrowseTheWeb/ImportBrowser.cs 2014-04-01 20:04:56 UTC (rev 4777)
@@ -195,8 +195,8 @@
MyLog.debug("open database");
SQLiteClient client = new SQLiteClient(path);
- List<BookmarkBase> dummy = new List<BookmarkBase>();
- ImportFFFolder(client, "2", dummy);
+ BookmarkFolder dummy = new BookmarkFolder();
+ ImportFFFolder(client, "2", dummy.Items);
Setup.FillTreeview(dummy, treeView1.Nodes);
MyLog.debug("close database");
client.Close();
@@ -250,11 +250,11 @@
private void ImportIE()
{
- List<BookmarkBase> dummy = new List<BookmarkBase>();
+ BookmarkFolder dummy = new BookmarkFolder();
string favPath = Environment.GetFolderPath(Environment.SpecialFolder.Favorites);
if (Directory.Exists(favPath))
{
- ImportIEFolder(favPath, dummy);
+ ImportIEFolder(favPath, dummy.Items);
Setup.FillTreeview(dummy, treeView1.Nodes);
}
else
@@ -299,8 +299,8 @@
string s = File.ReadAllText(path);
JSONNode node = JSONNode.LoadJSON(s);
List<JSONNode> res = node.GetNodes("roots/bookmark_bar/children", null);
- List<BookmarkBase> dummy = new List<BookmarkBase>();
- ImportChromeFolder(res, dummy);
+ BookmarkFolder dummy = new BookmarkFolder();
+ ImportChromeFolder(res, dummy.Items);
Setup.FillTreeview(dummy, treeView1.Nodes);
}
else
Modified: trunk/plugins/BrowseTheWeb/Source/BrowseTheWeb/Setup.cs
===================================================================
--- trunk/plugins/BrowseTheWeb/Source/BrowseTheWeb/Setup.cs 2014-03-27 16:17:25 UTC (rev 4776)
+++ trunk/plugins/BrowseTheWeb/Source/BrowseTheWeb/Setup.cs 2014-04-01 20:04:56 UTC (rev 4777)
@@ -70,9 +70,9 @@
}
- public static void FillTreeview(List<BookmarkBase> bookmarks, TreeNodeCollection nodes)
+ public static void FillTreeview(BookmarkFolder bmf, TreeNodeCollection nodes)
{
- foreach (BookmarkBase item in bookmarks)
+ foreach (BookmarkBase item in bmf.Items)
{
TreeNode newNode = nodes.Add(item.Name);
newNode.Tag = item;
@@ -80,7 +80,7 @@
{
newNode.ImageIndex = 1;
newNode.SelectedImageIndex = 1;
- FillTreeview(((BookmarkFolder)item).Items, newNode.Nodes);
+ FillTreeview((BookmarkFolder)item, newNode.Nodes);
}
}
}
@@ -95,18 +95,18 @@
treeview.Invalidate();
}
- private void FillBookmarks(TreeNodeCollection nodes, List<BookmarkBase> bms)
+ private void FillBookmarks(TreeNodeCollection nodes, BookmarkFolder bms)
{
foreach (TreeNode node in nodes)
{
BookmarkBase bkm = (BookmarkBase)node.Tag;
- bms.Add(bkm);
+ bms.Items.Add(bkm);
BookmarkFolder bmf = node.Tag as BookmarkFolder;
if (bmf != null)
{
bmf.Items.Clear();
- FillBookmarks(node.Nodes, bmf.Items);
+ FillBookmarks(node.Nodes, bmf);
}
}
}
This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.
|
