Merge branch 'dev'

johnkors · Feb 23, 2012 · 336ab83 · 336ab83
2 parents 7d85f68 + c00fb1b
commit 336ab83
Show file tree

Hide file tree

Showing 5 changed files with 16 additions and 7 deletions.
diff --git a/ParApply.Business/ParApply.Business.csproj b/ParApply.Business/ParApply.Business.csproj
@@ -50,6 +50,7 @@
     <Reference Include="System.Xml.Linq" />
   </ItemGroup>
   <ItemGroup>
+    <Compile Include="Services\IWebRequestFactory.cs" />
     <Compile Include="StedParser.cs" />
     <Compile Include="Services\ParaplyService.cs" />
     <Compile Include="Properties\AssemblyInfo.cs" />

diff --git a/ParApply.Business/Services/IWebRequestFactory.cs b/ParApply.Business/Services/IWebRequestFactory.cs
@@ -0,0 +1,10 @@
+using System;
+using System.Net;
+
+namespace ParApply.Business
+{
+    public interface IWebRequestFactory
+    {
+        HttpWebRequest CreateHttpWebRequest(Uri uri);
+    }
+}
diff --git a/ParApply.Business/Services/RestService.cs b/ParApply.Business/Services/RestService.cs
@@ -9,10 +9,9 @@ namespace ParApply.Business
 {
     public abstract class RestService<T> where T : class
     {
-
         protected void Get(Uri uri, Action<Result<IEnumerable<T>>> callback)
         {
-            var webRequest = (HttpWebRequest) WebRequest.Create(uri);
+            var webRequest = (HttpWebRequest) WebRequest.Create(uri); 
 
 
             webRequest.BeginGetResponse(delegate(IAsyncResult responseResult)

diff --git a/ParApply.WP7/MainPage.xaml.cs b/ParApply.WP7/MainPage.xaml.cs
@@ -32,6 +32,8 @@ public MainPage()
             _backgroundWorker = new BackgroundWorker();
             _backgroundWorker.DoWork += ParseNorgeFile;
             _backgroundWorker.RunWorkerCompleted += SetParsingCompleted;
+
+            // Stop dreaming about IoC-containers!
             _norgeParser = new StedParser();
             _norge = new Noreg();
             _paraplyService = new ParaplyService();
@@ -63,14 +65,11 @@ private void TryUpdateData()
         {
             if(_parsingComplete && _myLocation != null)
             {
-
-                _myLocation = new GeoCoordinate(59.923861, 10.7579014);
                 _sted = _norge.FindClosestSted(_myLocation);
                 _yrService.GetYrData(_sted, UpdateUI);
             }
         }
 
-
         private void SaveCurrentPosition(object sender, GeoPositionChangedEventArgs<GeoCoordinate> e)
         {
             _isFirstLookup = _myLocation == null;

diff --git a/ParApply.WP7/Properties/AssemblyInfo.cs b/ParApply.WP7/Properties/AssemblyInfo.cs
@@ -32,6 +32,6 @@
 //
 // You can specify all the values or you can default the Revision and Build Numbers 
 // by using the '*' as shown below:
-[assembly: AssemblyVersion("1.0.0.0")]
-[assembly: AssemblyFileVersion("1.0.0.0")]
+[assembly: AssemblyVersion("1.1.0.0")]
+[assembly: AssemblyFileVersion("1.1.0.0")]
 [assembly: NeutralResourcesLanguageAttribute("nb-NO")]