Replaced the old IndustryJobs with the Crius version. Changes some in…

…t types to long in IndustryJobs.
ezet · Jul 22, 2014 · d5ee339 · d5ee339
1 parent 4e0fd49
commit d5ee339
Show file tree

Hide file tree

Showing 11 changed files with 223 additions and 420 deletions.
diff --git a/EveLib.EveCrest/EveCrest.cs b/EveLib.EveCrest/EveCrest.cs
@@ -28,7 +28,7 @@ public EveCrest() {
         /// </summary>
         /// <returns></returns>
         public Task<CrestRoot> GetRootAsync() {
-            string relPath = "";
+            const string relPath = "";
             return requestAsync<CrestRoot>(relPath);
         }
 
@@ -154,7 +154,7 @@ public CrestMarketHistory GetMarketHistory(int regionId, int typeId) {
         /// </summary>
         /// <returns></returns>
         public Task<CrestMarketPrices> GetMarketPricesAsync() {
-            string relpath = "market/prices/";
+            const string relpath = "market/prices/";
             return requestAsync<CrestMarketPrices>(relpath);
         }
 

diff --git a/EveLib.EveCrest/Models/CrestIndustryTeamAuction.cs b/EveLib.EveCrest/Models/CrestIndustryTeamAuction.cs
@@ -63,9 +63,6 @@ public class TeamAuction {
             [DataMember(Name = "workers")]
             public List<CrestIndustryTeamWorker> Workers { get; set; }
 
-
-
-
         }
     }
 }
diff --git a/EveLib.EveOnline/Character.cs b/EveLib.EveOnline/Character.cs
@@ -423,16 +423,8 @@ public Task<EveApiResponse<FactionWarfareStats>> GetFactionWarfareStatsAsync() {
             return requestAsync<FactionWarfareStats>(relPath, ApiKey, "characterId", CharacterId);
         }
 
-        /// <summary>
-        ///     Returns the characters industry jobs.
-        /// </summary>
-        /// <returns></returns>
-        public EveApiResponse<IndustryJobs> GetIndustryJobs() {
-            return GetIndustryJobsAsync().Result;
-        }
-
-        /// <summary>
-        ///     Returns the characters industry jobs.
+  /// <summary>
+        ///     Returns the currently running industry jobs.
         /// </summary>
         /// <returns></returns>
         public Task<EveApiResponse<IndustryJobs>> GetIndustryJobsAsync() {
@@ -444,34 +436,25 @@ public Task<EveApiResponse<IndustryJobs>> GetIndustryJobsAsync() {
         ///     Returns the currently running industry jobs.
         /// </summary>
         /// <returns></returns>
-        public Task<EveApiResponse<NewIndustryJobs>> GetNewIndustryJobsAsync() {
-            const string relPath = "/char/IndustryJobs.xml.aspx";
-            return requestAsync<NewIndustryJobs>(relPath, ApiKey, "characterId", CharacterId);
-        }
-
-        /// <summary>
-        ///     Returns the currently running industry jobs.
-        /// </summary>
-        /// <returns></returns>
-        public EveApiResponse<NewIndustryJobs> GetNewIndustryJobs() {
-            return GetNewIndustryJobsAsync().Result;
+        public EveApiResponse<IndustryJobs> GetIndustryJobs() {
+            return GetIndustryJobsAsync().Result;
         }
 
 
         /// <summary>
         ///     Returns currently running and ended industry jobs.
         /// </summary>
         /// <returns></returns>
-        public Task<EveApiResponse<NewIndustryJobs>> GetIndustryJobsHistoryAsync() {
+        public Task<EveApiResponse<IndustryJobs>> GetIndustryJobsHistoryAsync() {
             const string relPath = "/char/IndustryJobsHistory.xml.aspx";
-            return requestAsync<NewIndustryJobs>(relPath, ApiKey, "characterId", CharacterId);
+            return requestAsync<IndustryJobs>(relPath, ApiKey, "characterId", CharacterId);
         }
 
         /// <summary>
         ///     Returns currently running and ended industry jobs.
         /// </summary>
         /// <returns></returns>
-        public EveApiResponse<NewIndustryJobs> GetIndustryJobsHistory() {
+        public EveApiResponse<IndustryJobs> GetIndustryJobsHistory() {
             return GetIndustryJobsHistoryAsync().Result;
         }
 

diff --git a/EveLib.EveOnline/Corporation.cs b/EveLib.EveOnline/Corporation.cs
@@ -347,55 +347,36 @@ public Task<EveApiResponse<FactionWarfareStats>> GetFactionWarfareStatsAsync() {
         }
 
         /// <summary>
-        ///     Returns the corporation industry jobs.
-        /// </summary>
-        /// <returns></returns>
-        public EveApiResponse<IndustryJobs> GetIndustryJobs() {
-            return GetIndustryJobsAsync().Result;
-        }
-
-
-        /// <summary>
-        ///     Returns the corporation industry jobs.
+        ///     Returns the currently running industry jobs.
         /// </summary>
         /// <returns></returns>
         public Task<EveApiResponse<IndustryJobs>> GetIndustryJobsAsync() {
             const string relPath = "/corp/IndustryJobs.xml.aspx";
             return requestAsync<IndustryJobs>(relPath, ApiKey);
         }
 
-
-        /// <summary>
-        ///     Returns the currently running industry jobs.
-        /// </summary>
-        /// <returns></returns>
-        public Task<EveApiResponse<NewIndustryJobs>> GetNewIndustryJobsAsync() {
-            const string relPath = "/corp/IndustryJobs.xml.aspx";
-            return requestAsync<NewIndustryJobs>(relPath, ApiKey);
-        }
-
         /// <summary>
         ///     Returns the currently running industry jobs.
         /// </summary>
         /// <returns></returns>
-        public EveApiResponse<NewIndustryJobs> GetNewIndustryJobs() {
-            return GetNewIndustryJobsAsync().Result;
+        public EveApiResponse<IndustryJobs> GetIndustryJobs() {
+            return GetIndustryJobsAsync().Result;
         }
 
         /// <summary>
         ///     Returns currently running and ended industry jobs.
         /// </summary>
         /// <returns></returns>
-        public Task<EveApiResponse<NewIndustryJobs>> GetIndustryJobsHistoryAsync() {
+        public Task<EveApiResponse<IndustryJobs>> GetIndustryJobsHistoryAsync() {
             const string relPath = "/corp/IndustryJobsHistory.xml.aspx";
-            return requestAsync<NewIndustryJobs>(relPath, ApiKey);
+            return requestAsync<IndustryJobs>(relPath, ApiKey);
         }
 
         /// <summary>
         ///     Returns currently running and ended industry jobs.
         /// </summary>
         /// <returns></returns>
-        public EveApiResponse<NewIndustryJobs> GetIndustryHistoryJobs() {
+        public EveApiResponse<IndustryJobs> GetIndustryHistoryJobs() {
             return GetIndustryJobsHistoryAsync().Result;
         }
 

diff --git a/EveLib.EveOnline/EveLib.EveOnline.csproj b/EveLib.EveOnline/EveLib.EveOnline.csproj
@@ -132,7 +132,6 @@
     <Compile Include="Models\Character\ContractItems.cs" />
     <Compile Include="Models\Character\ContractList.cs" />
     <Compile Include="Models\Character\FactionWarfareStats.cs" />
-    <Compile Include="Models\Character\IndustryJobs.cs" />
     <Compile Include="Models\Character\KillLog.cs" />
     <Compile Include="Models\Character\Locations.cs" />
     <Compile Include="Models\Character\MailBodies.cs" />
@@ -194,7 +193,7 @@
     <Compile Include="Models\Map\Kills.cs" />
     <Compile Include="Models\Map\Sovereignty.cs" />
     <Compile Include="Models\Map\SovereigntyStatus.cs" />
-    <Compile Include="Models\Character\NewIndustryJobs.cs" />
+    <Compile Include="Models\Character\IndustryJobs.cs" />
     <Compile Include="Exceptions\EveOnlineException.cs" />
     <Compile Include="RequestHandlers\WindowsCachedRequestHandler.cs" />
     <Compile Include="Util\XmlHelper.cs" />
-Original file line number
+Diff line change
@@ Expand Up / @@ -63,9 +63,6 @@ public class TeamAuction { @@
                 [DataMember(Name = "workers")]
                 public List<CrestIndustryTeamWorker> Workers { get; set; }
             }
         }
     }