Merge pull request #12 from olangness/ModelToViewModelBinding

Getting the link view to work

Author: olangness

WebCrawler/Model/Crawler.cs

@@ -25,7 +25,7 @@ public class Crawler
         private static List<string> _exceptions = new List<string>();
         private bool isCurrentPage = true;
         private static List<string> urlsWithTopics = new List<string>();
-        private static List<Link> links = new List<Link>();
+        private static ObservableCollection<Link> links = new ObservableCollection<Link>();
         private static ObservableCollection<Log> log = new ObservableCollection<Log>();
 
         private static Crawler instance = null;
@@ -56,7 +56,7 @@ public ObservableCollection<Log> Log
             set { log = value; }
         }
 
-        public List<Link> Links
+        public ObservableCollection<Link> Links
         {
             get { return links; }
             set { links = value; }
@@ -111,7 +111,7 @@ private void CrawlPage(string url)
                 page.Url = url;
 
                 _pages.Add(page);
-                //links.Add(url);
+                links.Add(new Link("Page Title", url));
                 log.Add(new Log($"New Entry: {url}", DateTime.Now));
 
                 linkParser.ParseLinks(page, url);

WebCrawler/Model/Data Storage/Data.cs

@@ -117,10 +117,8 @@ public Topic GetSpecificTopic(string name, string[] urls) // get a specific topi
 
         public void AddLink(string name, string url, int linkID, int parentID) // add a link to the list
         {
-            myLink.Name = name;
-            myLink.URL = url;
-            myLink.LinkID = linkID;
-            myLink.ParentID = parentID;
+            myLink.LinkName = name;
+            myLink.LinkURL = url;
 
             for (int i = 0; i < links.Length; i++)
             {
@@ -152,10 +150,10 @@ public Link[] GetLinks() // get the list of links
 
         public Link GetSpecificLink(string name, string url, int linkID, int parentID)
         {
-            Link temp = new Link("no Link found", "", 0, 0);
+            Link temp = new Link("no Link found", "");
             for (int i = 0; i < links.Length; i++)
             {
-                if (links[i].Name.Equals(name) && links[i].URL.Equals(url) && links[i].LinkID == linkID && links[i].ParentID == parentID)
+                if (links[i].LinkName.Equals(name) && links[i].LinkURL.Equals(url))
                 {
                     temp = links[i];
                 }

WebCrawler/Model/Data Storage/Link.cs

@@ -1,58 +1,55 @@
 using System;
 using System.Collections.Generic;
+using System.ComponentModel;
 using System.Linq;
 using System.Text;
 using System.Threading.Tasks;
 
 namespace WebCrawler.Model
 {
-    public class Link
+    public class Link : INotifyPropertyChanged
     {
-        string name;
-        string url;
-        int linkID;
-        int parentID;
 
         public Link()
         {
 
         }
-        public Link(string name, string url, int linkID, int parentID)
+        public Link(string name, string url)
         {
-            Name = name;
-            URL = url;
-            LinkID = linkID;
-            ParentID = parentID; //if parentID == 0, then this is root URL
+            LinkName = name;
+            LinkURL = url;
         }
 
-        public string Name
+        private string _linkName;
+        public string LinkName
         {
-            get { return name; }
-
-            set { name = value; }
+            get { return _linkName; }
+            set
+            {
+                _linkName = value;
+                NotifyPropertyChanged("LinkName");
+            }
         }
 
-        public string URL
+        private string _linkUrl;
+        public string LinkURL
         {
-            get { return url; }
-
-            set { url = value; }
+            get { return _linkUrl; }
+            set
+            {
+                _linkUrl = value;
+                NotifyPropertyChanged("LinkURL");
+            }
         }
 
-        public int LinkID
-        {
-            get { return linkID; }
-            set { linkID = value; }
-        }
+        public event PropertyChangedEventHandler PropertyChanged;
 
-        public int ParentID
+        private void NotifyPropertyChanged(String info)
         {
-            get { return parentID; }
-            set { parentID = value; }
+            if (PropertyChanged != null)
+            {
+                PropertyChanged(this, new PropertyChangedEventArgs(info));
+            }
         }
-
-
-
-
     }
 }

WebCrawler/Model/Data Storage/Log.cs

@@ -8,7 +8,7 @@
 
 namespace WebCrawler.Model
 {
-    public class Log : ILog
+    public class Log : INotifyPropertyChanged
     {
         string messageText;
         DateTime messageTime;

WebCrawler/View/WebsiteTree/WebsiteTreeTabView.xaml

@@ -6,19 +6,13 @@
              xmlns:local="clr-namespace:WebCrawler.View.WebsiteTree"
              mc:Ignorable="d" 
              d:DesignHeight="450" d:DesignWidth="800">
-    <Grid>
-
-        <Grid.RowDefinitions>
-            <RowDefinition Height="2*"></RowDefinition>
-            <RowDefinition Height="23*"></RowDefinition>
-        </Grid.RowDefinitions>
-        <Button Width="60" Grid.Row="0" HorizontalAlignment="Left" Command="{Binding Path=Refresh, Mode=OneWay}">Refresh</Button>
-        <TreeView Name="trvMenu" Grid.Row="1">
-            <TreeView.ItemTemplate>
-                <HierarchicalDataTemplate ItemsSource="{Binding Items}">
-                    <TextBlock Text="{Binding Title}" />
-                </HierarchicalDataTemplate>
-            </TreeView.ItemTemplate>
-        </TreeView>
-    </Grid>
+    <ListView Grid.Column="1" Name="ListViewProjects" Grid.RowSpan="3" SelectionChanged="ListViewLinkSelectionChanged" ItemsSource="{Binding Links}" IsSynchronizedWithCurrentItem="True" MinWidth="100">
+        <ListView.ItemTemplate>
+            <DataTemplate>
+                <WrapPanel>
+                    <TextBlock Text="{Binding Path=LinkURL}"/>
+                </WrapPanel>
+            </DataTemplate>
+        </ListView.ItemTemplate>
+    </ListView>
 </UserControl>

WebCrawler/View/WebsiteTree/WebsiteTreeTabView.xaml.cs

@@ -30,6 +30,10 @@ public WebsiteTreeTabView()
             // The DataContext serves as the starting point of Binding Paths
             DataContext = _viewModel;
         }
+
+        public void ListViewLinkSelectionChanged(object sender, SelectionChangedEventArgs e)
+        {
+        }
     }
 }
 

WebCrawler/ViewModel/WebsiteTree/WebsiteTreeTabViewModel.cs

@@ -1,30 +1,37 @@
 using GalaSoft.MvvmLight.Command;
 using System;
 using System.Collections.Generic;
+using System.Collections.ObjectModel;
+using System.ComponentModel;
 using System.Linq;
 using System.Text;
 using System.Threading.Tasks;
 using System.Windows.Input;
+using WebCrawler.Model;
 using WebCrawler.View.WebsiteTree;
 using static System.Windows.Forms.LinkLabel;
 
 namespace WebCrawler.ViewModel.WebsiteTree
 {
-    class WebsiteTreeTabViewModel
+    class WebsiteTreeTabViewModel : INotifyPropertyChanged
     {
-        public string WebsiteURL { get; set; }
 
-
-        public ICommand Refresh { get; private set; }
+        public ObservableCollection<Model.Link> Links { get; set; } = new ObservableCollection<Model.Link>();
 
         public WebsiteTreeTabViewModel()
         {
-            Refresh = new RelayCommand<object>(_ => RefreshTree());
+            Links = Crawler.Instance.Links;
         }
 
-        public void RefreshTree()
+        public event PropertyChangedEventHandler PropertyChanged;
+
+        protected void OnPropertyChange(string propertyName)
         {
-            Link parent = new Link();
+            if (PropertyChanged != null)
+            {
+                PropertyChanged(this, new PropertyChangedEventArgs(propertyName));
+            }
         }
+
     }
 }