From d37ee6521350abe24dd83f5f1607c30c92d292fe Mon Sep 17 00:00:00 2001
From: Erik <erik@busn.uconn.edu>
Date: Wed, 4 Apr 2012 15:22:11 -0400
Subject: [PATCH] Added rudimentary "Program" / task interface and execution. 
 This will form the foundation of the various programs and sequencies that the
 app will send to RDS.

---
 DataScraperGUI/DataScraperGUI.csproj     |  3 +++
 DataScraperGUI/Infrastructure/Logger.cs  |  2 +-
 DataScraperGUI/MainWindow.xaml.cs        |  4 ++++
 DataScraperGUI/Programs/IProgram.cs      | 10 ++++++++++
 DataScraperGUI/Programs/NormalProgram.cs | 16 ++++++++++++++++
 DataScraperGUI/Programs/Program.cs       | 23 +++++++++++++++++++++++
 ECESeniorDesign.sln                      |  6 ------
 7 files changed, 57 insertions(+), 7 deletions(-)
 create mode 100644 DataScraperGUI/Programs/IProgram.cs
 create mode 100644 DataScraperGUI/Programs/NormalProgram.cs
 create mode 100644 DataScraperGUI/Programs/Program.cs

diff --git a/DataScraperGUI/DataScraperGUI.csproj b/DataScraperGUI/DataScraperGUI.csproj
index 207a8de..985899f 100644
--- a/DataScraperGUI/DataScraperGUI.csproj
+++ b/DataScraperGUI/DataScraperGUI.csproj
@@ -63,6 +63,7 @@
       <DependentUpon>App.xaml</DependentUpon>
       <SubType>Code</SubType>
     </Compile>
+    <Compile Include="Programs\IProgram.cs" />
     <Compile Include="Infrastructure\Logger.cs" />
     <Compile Include="MainWindow.xaml.cs">
       <DependentUpon>MainWindow.xaml</DependentUpon>
@@ -70,6 +71,8 @@
     </Compile>
   </ItemGroup>
   <ItemGroup>
+    <Compile Include="Programs\NormalProgram.cs" />
+    <Compile Include="Programs\Program.cs" />
     <Compile Include="Properties\AssemblyInfo.cs">
       <SubType>Code</SubType>
     </Compile>
diff --git a/DataScraperGUI/Infrastructure/Logger.cs b/DataScraperGUI/Infrastructure/Logger.cs
index eb8f51f..fb3de51 100644
--- a/DataScraperGUI/Infrastructure/Logger.cs
+++ b/DataScraperGUI/Infrastructure/Logger.cs
@@ -5,7 +5,7 @@ using System.Text;
 using System.Windows.Controls;
 
 namespace DataScraperGUI.Infrastructure {
-    class Logger {
+    public class Logger {
         private TextBox logBox = null;
 
         public Logger (TextBox lBox) {
diff --git a/DataScraperGUI/MainWindow.xaml.cs b/DataScraperGUI/MainWindow.xaml.cs
index cca9cb7..b056173 100644
--- a/DataScraperGUI/MainWindow.xaml.cs
+++ b/DataScraperGUI/MainWindow.xaml.cs
@@ -12,6 +12,7 @@ using System.Windows.Media.Imaging;
 using System.Windows.Navigation;
 using System.Windows.Shapes;
 using DataScraperGUI.Infrastructure;
+using DataScraperGUI.Programs;
 
 namespace DataScraperGUI {
     /// <summary>
@@ -30,6 +31,9 @@ namespace DataScraperGUI {
 
         private void runButton_Click (object sender, RoutedEventArgs e) {
             logger.LogWarning("Run button pressed!");
+
+            var p = new NormalProgram(logger);
+            p.Execute();
         }
     }
 }
diff --git a/DataScraperGUI/Programs/IProgram.cs b/DataScraperGUI/Programs/IProgram.cs
new file mode 100644
index 0000000..8c6ff0f
--- /dev/null
+++ b/DataScraperGUI/Programs/IProgram.cs
@@ -0,0 +1,10 @@
+using System;
+using System.Collections.Generic;
+using System.Linq;
+using System.Text;
+
+namespace DataScraperGUI.Programs {
+    interface IProgram {
+        void Execute();
+    }
+}
diff --git a/DataScraperGUI/Programs/NormalProgram.cs b/DataScraperGUI/Programs/NormalProgram.cs
new file mode 100644
index 0000000..12f0afe
--- /dev/null
+++ b/DataScraperGUI/Programs/NormalProgram.cs
@@ -0,0 +1,16 @@
+using System;
+using System.Collections.Generic;
+using System.Linq;
+using System.Text;
+using DataScraperGUI.Infrastructure;
+
+namespace DataScraperGUI.Programs {
+    public class NormalProgram : Program {
+        public NormalProgram (Logger l) : base(l) { }
+
+        
+        public override void Execute() {
+            logger.LogError("This program has not yet been implemented.");
+        }
+    }
+}
diff --git a/DataScraperGUI/Programs/Program.cs b/DataScraperGUI/Programs/Program.cs
new file mode 100644
index 0000000..80d95d7
--- /dev/null
+++ b/DataScraperGUI/Programs/Program.cs
@@ -0,0 +1,23 @@
+using System;
+using System.Collections.Generic;
+using System.Linq;
+using System.Text;
+using DataScraperGUI.Infrastructure;
+
+namespace DataScraperGUI.Programs {
+    public class Program : IProgram {
+        protected Logger logger;
+
+        public Program (Logger l) {
+            logger = l;
+        }
+
+        protected Program() {
+            throw new NotImplementedException();
+        }
+
+        public virtual void Execute() {
+            throw new NotImplementedException();
+        }
+    }
+}
diff --git a/ECESeniorDesign.sln b/ECESeniorDesign.sln
index d567a3b..4f04f25 100644
--- a/ECESeniorDesign.sln
+++ b/ECESeniorDesign.sln
@@ -1,8 +1,6 @@
 
 Microsoft Visual Studio Solution File, Format Version 11.00
 # Visual Studio 2010
-Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "DataScraperCLI", "DataScraperCLI\DataScraperCLI.csproj", "{0ACA125D-6725-4A0B-8C61-05EE786943C5}"
-EndProject
 Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "DataScraperGUI", "DataScraperGUI\DataScraperGUI.csproj", "{7F6FFC40-814A-44A9-900E-BC450AE69F30}"
 EndProject
 Global
@@ -11,10 +9,6 @@ Global
 		Release|x86 = Release|x86
 	EndGlobalSection
 	GlobalSection(ProjectConfigurationPlatforms) = postSolution
-		{0ACA125D-6725-4A0B-8C61-05EE786943C5}.Debug|x86.ActiveCfg = Debug|x86
-		{0ACA125D-6725-4A0B-8C61-05EE786943C5}.Debug|x86.Build.0 = Debug|x86
-		{0ACA125D-6725-4A0B-8C61-05EE786943C5}.Release|x86.ActiveCfg = Release|x86
-		{0ACA125D-6725-4A0B-8C61-05EE786943C5}.Release|x86.Build.0 = Release|x86
 		{7F6FFC40-814A-44A9-900E-BC450AE69F30}.Debug|x86.ActiveCfg = Debug|x86
 		{7F6FFC40-814A-44A9-900E-BC450AE69F30}.Debug|x86.Build.0 = Debug|x86
 		{7F6FFC40-814A-44A9-900E-BC450AE69F30}.Release|x86.ActiveCfg = Release|x86