diff --git a/CampusAppWP8/CampusAppWP8/Feed/Mensa/MensaFeed.cs b/CampusAppWP8/CampusAppWP8/Feed/Mensa/MensaFeed.cs
index ef3405ee..da1b043b 100644
--- a/CampusAppWP8/CampusAppWP8/Feed/Mensa/MensaFeed.cs
+++ b/CampusAppWP8/CampusAppWP8/Feed/Mensa/MensaFeed.cs
@@ -11,11 +11,14 @@ namespace CampusAppWP8.Api.Mensa
using System.Collections.ObjectModel;
using CampusAppWP8.Model.Mensa;
using CampusAppWP8.Utility;
+ using CampusAppWP8.Model;
+ using CampusAppWP8.Resources;
+ using System.IO;
///
/// This Class is for MensaFeeds
///
- public class MensaFeed : XmlFeed
+ public class MensaFeed : XmlModel
{
#region Constructor
@@ -23,8 +26,10 @@ namespace CampusAppWP8.Api.Mensa
/// Initializes a new instance of the class.
///
public MensaFeed()
- : base(URLList.MensaFeedURL, FileList.MensaXmlFile)
+ : base(ModelType.FileAndFeed, Constants.FileMensa_Shedule, Constants.UrlMensa_Week)
{
+ this.isFileUpToDate += new IsFileUpToDate(this.CheckIsFileUpToDate);
+ this.isModelUpToDate += new IsModelUpToDate(this.CheckIsModelUpToDate);
}
#endregion
@@ -37,7 +42,7 @@ namespace CampusAppWP8.Api.Mensa
/// Method implement CheckIsModelUpToDate()-Method
///
/// true, if model is up-to-date, otherwise false
- protected override bool CheckIsModelUpToDate()
+ private bool CheckIsModelUpToDate(MenuWeekModel model)
{
DateTime lastModified = this.Model.CreateTime;
return this.CheckIsUpToDate(lastModified);
@@ -47,9 +52,9 @@ namespace CampusAppWP8.Api.Mensa
/// Method implement CheckIsFileUpToDate()-Method
///
/// true, if file is up-to-date, otherwise false
- protected override bool CheckIsFileUpToDate()
+ private bool CheckIsFileUpToDate(MenuWeekModel model, FileInfo fileInfo)
{
- DateTime lastModified = FileManager.GetFileInfo(FileName).LastWriteTime;
+ DateTime lastModified = fileInfo.LastWriteTime;
return this.CheckIsUpToDate(lastModified);
}
diff --git a/CampusAppWP8/CampusAppWP8/Resources/Constants.Designer.cs b/CampusAppWP8/CampusAppWP8/Resources/Constants.Designer.cs
index ca2cce6d..a223d9b3 100644
--- a/CampusAppWP8/CampusAppWP8/Resources/Constants.Designer.cs
+++ b/CampusAppWP8/CampusAppWP8/Resources/Constants.Designer.cs
@@ -96,6 +96,15 @@ namespace CampusAppWP8.Resources {
}
}
+ ///
+ /// Sucht eine lokalisierte Zeichenfolge, die MensaFeed.xml ähnelt.
+ ///
+ public static string FileMensa_Shedule {
+ get {
+ return ResourceManager.GetString("FileMensa_Shedule", resourceCulture);
+ }
+ }
+
///
/// Sucht eine lokalisierte Zeichenfolge, die StudentCouncils.xml ähnelt.
///
@@ -438,6 +447,15 @@ namespace CampusAppWP8.Resources {
}
}
+ ///
+ /// Sucht eine lokalisierte Zeichenfolge, die http://www.studentenwerk-frankfurt.de/2011/ClassPackage/App_IKMZ_BTU/ ähnelt.
+ ///
+ public static string UrlMensa_Week {
+ get {
+ return ResourceManager.GetString("UrlMensa_Week", resourceCulture);
+ }
+ }
+
///
/// Sucht eine lokalisierte Zeichenfolge, die http://www.tu-cottbus.de/campusapp-data/getdata.php?db=studentcouncils&app=2&appversion=1 ähnelt.
///
diff --git a/CampusAppWP8/CampusAppWP8/Resources/Constants.resx b/CampusAppWP8/CampusAppWP8/Resources/Constants.resx
index 3a6c8ba2..e9085ad5 100644
--- a/CampusAppWP8/CampusAppWP8/Resources/Constants.resx
+++ b/CampusAppWP8/CampusAppWP8/Resources/Constants.resx
@@ -252,4 +252,10 @@
+
+ MensaFeed.xml
+
+
+ http://www.studentenwerk-frankfurt.de/2011/ClassPackage/App_IKMZ_BTU/
+
\ No newline at end of file
diff --git a/CampusAppWP8/CampusAppWP8/pages/mensa/MensaPage.xaml.cs b/CampusAppWP8/CampusAppWP8/pages/mensa/MensaPage.xaml.cs
index 9239ebdf..7dfa87a9 100644
--- a/CampusAppWP8/CampusAppWP8/pages/mensa/MensaPage.xaml.cs
+++ b/CampusAppWP8/CampusAppWP8/pages/mensa/MensaPage.xaml.cs
@@ -66,7 +66,7 @@ namespace CampusAppWP8.Pages.Mensa
this.InitializeFeed();
}
this.ProgressBar.Visibility = System.Windows.Visibility.Visible;
- this.feed.LoadFeed();
+ this.feed.LoadData();
}
#endregion
#region private
@@ -77,7 +77,7 @@ namespace CampusAppWP8.Pages.Mensa
private void InitializeFeed()
{
this.feed = new MensaFeed();
- this.feed.EventHandler.FeedIsReadyEvent += new FeedEventHandler.FeedReadyHandler(this.FeedIsReady);
+ this.feed.onLoaded += new MensaFeed.OnLoaded(this.FeedIsReady);
this.CalcSelectedIndex();
}
diff --git a/CampusAppWP8/CampusAppWP8/utility/FileList.cs b/CampusAppWP8/CampusAppWP8/utility/FileList.cs
index 18f5b3f1..a080bd08 100644
--- a/CampusAppWP8/CampusAppWP8/utility/FileList.cs
+++ b/CampusAppWP8/CampusAppWP8/utility/FileList.cs
@@ -18,7 +18,7 @@ namespace CampusAppWP8.Utility
///
/// Name of the file for the feed of the mensa.
///
- public static readonly string MensaXmlFile = "MesaFeed.xml";
+ public static readonly string MensaXmlFile = "MensaFeed.xml";
///
/// Opening hours feed file name.