X-Git-Url: http://git.osdn.jp/view?a=blobdiff_plain;f=win%2FC%23%2FfrmActivityWindow.cs;h=613a1a4c2c31a912d16abb5fa1f0940996703642;hb=4f0019f03c2e85e8634150ff0c9a31bee6d35ce5;hp=84f9bddd5639fc6446cf6e7f94a5e6d0a38506b2;hpb=36a22826944323e796cb5de50fe0e10f23d3af07;p=handbrake-jp%2Fhandbrake-jp-git.git

diff --git a/win/C#/frmActivityWindow.cs b/win/C#/frmActivityWindow.cs
index 84f9bddd..613a1a4c 100644
--- a/win/C#/frmActivityWindow.cs
+++ b/win/C#/frmActivityWindow.cs
@@ -1,364 +1,502 @@
 /*  frmActivityWindow.cs $
- 	
- 	   This file is part of the HandBrake source code.
- 	   Homepage: <http://handbrake.fr>.
- 	   It may be used under the terms of the GNU General Public License. */
-
-using System;
-using System.Windows.Forms;
-using System.IO;
-using System.Threading;
-using Handbrake.EncodeQueue;
-using Handbrake.Functions;
-using Microsoft.Win32;
-
+    This file is part of the HandBrake source code.
+    Homepage: <http://handbrake.fr>.
+    It may be used under the terms of the GNU General Public License. */
 
 namespace Handbrake
 {
+    using System;
+    using System.ComponentModel;
+    using System.Diagnostics;
+    using System.IO;
+    using System.Text;
+    using System.Threading;
+    using System.Windows.Forms;
+    using Functions;
+    using Model;
+    using Services;
+    using Timer = System.Threading.Timer;
+
+    /// <summary>
+    /// The Activity Log Window
+    /// </summary>
     public partial class frmActivityWindow : Form
     {
-        delegate void SetTextCallback(string text);
-        String read_file;
-        Thread monitor;
-        EncodeAndQueueHandler encodeQueue;
-        int position;  // Position in the arraylist reached by the current log output in the rtf box.
-        string logDir = Environment.GetFolderPath(Environment.SpecialFolder.ApplicationData) + "\\HandBrake\\logs";
-        private frmMain mainWin;
+        /* Private Variables */
+
+        /// <summary>
+        /// The current position in the log file
+        /// </summary>
+        private int position;
 
         /// <summary>
-        /// This window should be used to display the RAW output of the handbrake CLI which is produced during an encode.
+        /// A Timer for this window
         /// </summary>
-        public frmActivityWindow(string file, EncodeAndQueueHandler eh, frmMain mw)
+        private Timer windowTimer;
+
+        /// <summary>
+        /// The Encode Object
+        /// </summary>
+        private Encode encode;
+
+        /// <summary>
+        /// The Scan Object
+        /// </summary>
+        private ScanService scan;
+
+        /// <summary>
+        /// The Type of log that the window is currently dealing with
+        /// </summary>
+        private ActivityLogMode mode;
+
+        /* Constructor */
+
+        /// <summary>
+        /// Initializes a new instance of the <see cref="frmActivityWindow"/> class.
+        /// </summary>
+        /// <param name="encode">
+        /// The encode.
+        /// </param>
+        /// <param name="scan">
+        /// The scan.
+        /// </param>
+        public frmActivityWindow(Encode encode, ScanService scan)
         {
             InitializeComponent();
 
-            rtf_actLog.Text = string.Empty;
-            encodeQueue = eh;
-            position = 0;
-            mainWin = mw;
+            this.encode = encode;
+            this.scan = scan;
+            this.position = 0;
 
-            // When the window closes, we want to abort the monitor thread.
-            this.Disposed += new EventHandler(forceQuit);
+            // Listen for Scan and Encode Starting Events
+            scan.ScanStared += scan_ScanStared;
+            encode.EncodeStarted += encode_EncodeStarted;
+        }
 
-            // Print the Log header in the Rich text box.
-            displayLogHeader();
+        /* Delegates */
 
-            if (file == "last_scan_log.txt")
-                setLogView(true);
-            else
-                setLogView(false);
+        /// <summary>
+        /// A callback function for updating the ui
+        /// </summary>
+        /// <param name="text">
+        /// The text.
+        /// </param>
+        private delegate void SetTextCallback(StringBuilder text);
 
-            // Start a new thread which will montior and keep the log window up to date if required/
-            startLogThread(read_file);
-        }
+        /// <summary>
+        /// Clear text callback
+        /// </summary>
+        private delegate void SetTextClearCallback();
+
+        /// <summary>
+        /// Set mode callback
+        /// </summary>
+        /// <param name="setMode">
+        /// The set mode.
+        /// </param>
+        private delegate void SetModeCallback(ActivityLogMode setMode);
+
+        /* Private Methods */
 
         /// <summary>
-        /// Set the file which the log window is viewing.
+        /// Set the window to scan mode
         /// </summary>
-        /// <param name="scan"></param>
-        public void setLogView(Boolean scan)
+        /// <param name="setMode">
+        /// The set Mode.
+        /// </param>
+        private void SetMode(ActivityLogMode setMode)
         {
-            if (scan)
-            {
-                txt_log.Text = "Scan Log";
-                read_file = "last_scan_log.txt";
-            }
-            else
+            if (IsHandleCreated)
             {
-                read_file = "last_encode_log.txt";
-                txt_log.Text = "Encode Log";
+                if (rtf_actLog.InvokeRequired)
+                {
+                    IAsyncResult invoked = BeginInvoke(new SetModeCallback(SetMode), new object[] {setMode});
+                    EndInvoke(invoked);
+                }
+                else
+                {
+                    Reset();
+                    this.mode = setMode;
+
+                    Array values = Enum.GetValues(typeof(ActivityLogMode));
+                    Properties.Settings.Default.ActivityWindowLastMode = (int) values.GetValue(Convert.ToInt32(setMode));
+                    Properties.Settings.Default.Save();
+
+                    this.Text = mode == ActivityLogMode.Scan
+                                    ? "Activity Window (Scan Log)"
+                                    : "Activity Window (Encode Log)";
+
+                    if (mode == ActivityLogMode.Scan)
+                    {
+                        scan.ScanCompleted += stopWindowRefresh;
+                        encode.EncodeEnded -= stopWindowRefresh;
+                    }
+                    else
+                    {
+                        scan.ScanCompleted -= stopWindowRefresh;
+                        encode.EncodeEnded += stopWindowRefresh;
+                    }
+
+                    // Start a fresh window timer
+                    windowTimer = new Timer(new TimerCallback(LogMonitor), null, 1000, 1000);
+                }
             }
         }
 
         /// <summary>
-        /// Displays the Log header
+        /// On Window load, start a new timer
         /// </summary>
-        private void displayLogHeader()
+        /// <param name="sender">
+        /// The sender.
+        /// </param>
+        /// <param name="e">
+        /// The e.
+        /// </param>
+        private void NewActivityWindow_Load(object sender, EventArgs e)
         {
-            // Add a header to the log file indicating that it's from the Windows GUI and display the windows version
-            rtf_actLog.AppendText(String.Format("### Windows GUI {1} {0} \n", Properties.Settings.Default.hb_build, Properties.Settings.Default.hb_version));
-            rtf_actLog.AppendText(String.Format("### Running: {0} \n###\n", Environment.OSVersion));
-            rtf_actLog.AppendText(String.Format("### CPU: {0} \n", getCpuCount()));
-            rtf_actLog.AppendText(String.Format("### Ram: {0} MB \n", TotalPhysicalMemory()));
-            rtf_actLog.AppendText(String.Format("### Screen: {0}x{1} \n", screenBounds().Bounds.Width, screenBounds().Bounds.Height));
-            rtf_actLog.AppendText(String.Format("### Temp Dir: {0} \n", Path.GetTempPath()));
-            rtf_actLog.AppendText(String.Format("### Install Dir: {0} \n", Application.StartupPath));
-            rtf_actLog.AppendText(String.Format("### Data Dir: {0} \n", Application.UserAppDataPath));
-            rtf_actLog.AppendText("#########################################\n\n");
-            if (encodeQueue.isEncoding && encodeQueue.LastEncode.Query != String.Empty)
-            {
-                rtf_actLog.AppendText("### CLI Query: " + encodeQueue.LastEncode.Query + "\n\n");
-                rtf_actLog.AppendText("#########################################\n\n");
-            }
+            ActivityLogMode activitLogMode = (ActivityLogMode) Enum.ToObject(typeof(ActivityLogMode), Properties.Settings.Default.ActivityWindowLastMode);
+            SetMode(activitLogMode);        
         }
 
         /// <summary>
-        /// Starts a new thread which runs the autoUpdate function.
+        /// Set the Log window to encode mode when an encode starts.
         /// </summary>
-        /// <param name="file"> File which will be used to populate the Rich text box.</param>
-        private void startLogThread(string file)
+        /// <param name="sender">
+        /// The sender.
+        /// </param>
+        /// <param name="e">
+        /// The e.
+        /// </param>
+        private void encode_EncodeStarted(object sender, EventArgs e)
         {
-            try
+            SetMode(ActivityLogMode.Encode);
+        }
+
+        /// <summary>
+        /// Set the log widow to scan mode when a scan starts
+        /// </summary>
+        /// <param name="sender">
+        /// The sender.
+        /// </param>
+        /// <param name="e">
+        /// The e.
+        /// </param>
+        private void scan_ScanStared(object sender, EventArgs e)
+        {
+            SetMode(ActivityLogMode.Scan);
+        }
+
+        /// <summary>
+        /// Stop refreshing the window when no scanning or encoding is happening.
+        /// </summary>
+        /// <param name="sender">
+        /// The sender.
+        /// </param>
+        /// <param name="e">
+        /// The e.
+        /// </param>
+        private void stopWindowRefresh(object sender, EventArgs e)
+        {
+            windowTimer.Dispose();
+            LogMonitor(null);
+        }
+
+        /// <summary>
+        /// Append new text to the window
+        /// </summary>
+        /// <param name="n">
+        /// The n.
+        /// </param>
+        private void LogMonitor(object n)
+        {
+            AppendWindowText(GetLog());
+        }
+
+        /// <summary>
+        /// New Code for getting the Activity log from the Services rather than reading a file.
+        /// </summary>
+        /// <returns>
+        /// The StringBuilder containing a log
+        /// </returns>
+        private StringBuilder GetLog()
+        {
+            StringBuilder appendText = new StringBuilder();
+
+            if (this.mode == ActivityLogMode.Scan)
             {
-                string logFile = Path.Combine(logDir, file);
-                if (File.Exists(logFile))
+                if (scan == null || scan.ActivityLog == string.Empty)
                 {
-                    // Start a new thread to run the autoUpdate process
-                    monitor = new Thread(autoUpdate);
-                    monitor.IsBackground = true;
-                    monitor.Start();
+                    appendText.AppendFormat("Waiting for the log to be generated ...\n");
+                    position = 0;
+                    ClearWindowText();
+                    PrintLogHeader();
+                    return appendText;
                 }
-                else
-                    rtf_actLog.AppendText("\n\n\nERROR: The log file could not be found. \nMaybe you cleared your system's tempory folder or maybe you just havn't run an encode yet. \nTried to find the log file in: " + logFile);
 
+                using (StringReader reader = new StringReader(scan.ActivityLog))
+                {
+                    LogReader(reader, appendText);
+                }
             }
-            catch (Exception exc)
+            else
             {
-                MessageBox.Show("startLogThread(): Exception: \n" + exc);
+                if (encode == null || encode.ActivityLog == string.Empty)
+                {
+                    appendText.AppendFormat("Waiting for the log to be generated ...\n");
+                    position = 0;
+                    ClearWindowText();
+                    PrintLogHeader();
+                    return appendText;
+                }
+
+                using (StringReader reader = new StringReader(encode.ActivityLog))
+                {
+                    LogReader(reader, appendText);
+                }
             }
+            return appendText;
         }
 
         /// <summary>
-        /// Updates the log window with any new data which is in the log file.
-        /// This is done every 5 seconds.
+        /// Reads the log data from a Scan or Encode object
         /// </summary>
-        /// <param name="state"></param>
-        private void autoUpdate(object state)
+        /// <param name="reader">
+        /// The reader.
+        /// </param>
+        /// <param name="appendText">
+        /// The append text.
+        /// </param>
+        private void LogReader(StringReader reader, StringBuilder appendText)
         {
-            try
+            string line;
+            int i = 1;
+            while ((line = reader.ReadLine()) != null)
             {
-                Boolean lastUpdate = false;
-                updateTextFromThread();
-                while (true)
+                if (i > position)
                 {
-                    if (encodeQueue.isEncoding || mainWin.isScanning)
-                        updateTextFromThread();
-                    else
-                    {
-                        // The encode may just have stoped, so, refresh the log one more time before restarting it.
-                        if (lastUpdate == false)
-                            updateTextFromThread();
-
-                        lastUpdate = true; // Prevents the log window from being updated when there is no encode going.
-                        position = 0; // There is no encoding, so reset the log position counter to 0 so it can be reused
-                    }
-                    Thread.Sleep(5000);
+                    appendText.AppendLine(line);
+                    position++;
                 }
-            }
-            catch (ThreadAbortException)
-            {
-                // Do Nothing. This is needed since we run thread.abort(). 
-                // Should probably find a better way of making this work at some point.
-            }
-            catch (Exception exc)
-            {
-                MessageBox.Show("autoUpdate(): Exception: \n" + exc);
+                i++;
             }
         }
 
         /// <summary>
-        /// Finds any new text in the log file and calls a funciton to display this new text.
+        /// Append text to the RTF box
         /// </summary>
-        private void updateTextFromThread()
+        /// <param name="text">
+        /// The text.
+        /// </param>
+        private void AppendWindowText(StringBuilder text)
         {
             try
             {
-                String info = readFile();
-                if (info.Contains("has exited"))
-                    info += "\n ############ End of Log ############## \n";
+                if (IsHandleCreated)
+                {
+                    if (rtf_actLog.InvokeRequired)
+                    {
+                        IAsyncResult invoked = BeginInvoke(new SetTextCallback(AppendWindowText), new object[] { text });
+                        EndInvoke(invoked);
+                    }
+                    else
+                        lock (rtf_actLog)
+                            rtf_actLog.AppendText(text.ToString());
 
-                SetText(info);
+                    // Stop the refresh process if log has finished.
+                    if (text.ToString().Contains("HandBrake has Exited"))
+                    {
+                        windowTimer.Dispose();
+                    }
+                }
             }
-            catch (Exception exc)
+            catch (Exception)
             {
-                MessageBox.Show("updateTextFromThread(): Exception: \n" + exc);
+                return;
             }
         }
 
         /// <summary>
-        /// Updates the rich text box with anything in the string text.
+        /// Clear the contents of the log window
         /// </summary>
-        /// <param name="text"></param>
-        private void SetText(string text)
+        private void ClearWindowText()
         {
             try
             {
-                // InvokeRequired required compares the thread ID of the
-                // calling thread to the thread ID of the creating thread.
-                // If these threads are different, it returns true.
-                if (IsHandleCreated) // Make sure the windows has a handle before doing anything
+                if (IsHandleCreated)
                 {
                     if (rtf_actLog.InvokeRequired)
                     {
-                        SetTextCallback d = new SetTextCallback(SetText);
-                        Invoke(d, new object[] { text });
+                        IAsyncResult invoked = BeginInvoke(new SetTextClearCallback(ClearWindowText));
+                        EndInvoke(invoked);
                     }
                     else
-                        rtf_actLog.AppendText(text);
+                        lock (rtf_actLog)
+                            rtf_actLog.Clear();
                 }
             }
-            catch (Exception exc)
+            catch (Exception)
             {
-                MessageBox.Show("SetText(): Exception: \n" + exc);
+                return;
             }
         }
 
         /// <summary>
-        /// Read the log file, and store the data in a List.
+        /// Display the log header
         /// </summary>
-        /// <returns></returns>
-        private String readFile()
+        private void PrintLogHeader()
         {
-            String appendText = String.Empty;
             try
             {
-                // last_encode_log.txt is the primary log file. Since .NET can't read this file whilst the CLI is outputing to it (Not even in read only mode),
-                // we'll need to make a copy of it.
-                string logFile = Path.Combine(logDir, read_file);
-                string logFile2 = Path.Combine(logDir, "tmp_appReadable_log.txt");
-
-                // Make sure the application readable log file does not already exist. FileCopy fill fail if it does.
-                if (File.Exists(logFile2))
-                    File.Delete(logFile2);
-
-                // Copy the log file.
-                File.Copy(logFile, logFile2);
-
-                // Open the copied log file for reading
-                StreamReader sr = new StreamReader(logFile2);
-                string line;
-                int i = 1;
-                while ((line = sr.ReadLine()) != null)
+                if (IsHandleCreated)
                 {
-                    if (i > position)
+                    if (rtf_actLog.InvokeRequired)
                     {
-                        appendText += line + Environment.NewLine;
-                        position++;
+                        IAsyncResult invoked = BeginInvoke(new SetTextClearCallback(PrintLogHeader));
+                        EndInvoke(invoked);
+                    }
+                    else
+                    {
+                        lock (rtf_actLog)
+                        {
+                            // Print the log header. This function will be re-implimented later. Do not delete.
+                            StringBuilder header = new StringBuilder();
+
+                            header.Append(String.Format("### Windows GUI {1} {0} \n", Properties.Settings.Default.hb_build, Properties.Settings.Default.hb_version));
+                            header.Append(String.Format("### Running: {0} \n###\n", Environment.OSVersion));
+                            header.Append(String.Format("### CPU: {0} \n", SystemInfo.GetCpuCount));
+                            header.Append(String.Format("### Ram: {0} MB \n", SystemInfo.TotalPhysicalMemory));
+                            header.Append(String.Format("### Screen: {0}x{1} \n", SystemInfo.ScreenBounds.Bounds.Width, SystemInfo.ScreenBounds.Bounds.Height));
+                            header.Append(String.Format("### Temp Dir: {0} \n", Path.GetTempPath()));
+                            header.Append(String.Format("### Install Dir: {0} \n", Application.StartupPath));
+                            header.Append(String.Format("### Data Dir: {0} \n", Application.UserAppDataPath));
+                            header.Append("#########################################\n\n");
+
+                            rtf_actLog.AppendText(header.ToString());
+                        }
                     }
-                    i++;
                 }
-                sr.Close();
-                sr.Dispose();
-
-                return appendText;
             }
-            catch (Exception exc)
+            catch (Exception)
             {
-                MessageBox.Show("Error in readFile() \n Unable to read the log file.\n You may have to restart HandBrake.\n  Error Information: \n\n" + exc, "Warning", MessageBoxButtons.OK, MessageBoxIcon.Warning);
+                return;
             }
-            return null;
         }
 
         /// <summary>
-        /// Kills the montior thead when the window is disposed of.
+        /// Reset Everything
         /// </summary>
-        /// <param name="sender"></param>
-        /// <param name="e"></param>
-        private void forceQuit(object sender, EventArgs e)
+        private void Reset()
         {
-            if (monitor != null)
-            {
-                while (monitor.IsAlive)
-                    monitor.Abort();
-            }
-
-            this.Close();
+            if (windowTimer != null)
+                windowTimer.Dispose();
+            position = 0;
+            ClearWindowText();
+            PrintLogHeader();
+            windowTimer = new Timer(new TimerCallback(LogMonitor), null, 1000, 1000);
         }
 
-        #region User Interface
+        /* Menus and Buttons */
 
-        private void mnu_copy_log_Click(object sender, EventArgs e)
+        /// <summary>
+        /// Copy log to clipboard
+        /// </summary>
+        /// <param name="sender">
+        /// The sender.
+        /// </param>
+        /// <param name="e">
+        /// The e.
+        /// </param>
+        private void MnuCopyLogClick(object sender, EventArgs e)
         {
-            if (rtf_actLog.SelectedText != "")
-                Clipboard.SetDataObject(rtf_actLog.SelectedText, true);
-            else
-                Clipboard.SetDataObject(rtf_actLog.Text, true);
+            Clipboard.SetDataObject(rtf_actLog.SelectedText != string.Empty ? rtf_actLog.SelectedText : rtf_actLog.Text, true);
         }
-        private void mnu_openLogFolder_Click(object sender, EventArgs e)
+
+        /// <summary>
+        /// Open the log folder
+        /// </summary>
+        /// <param name="sender">
+        /// The sender.
+        /// </param>
+        /// <param name="e">
+        /// The e.
+        /// </param>
+        private void MnuOpenLogFolderClick(object sender, EventArgs e)
         {
             string logDir = Environment.GetFolderPath(Environment.SpecialFolder.ApplicationData) + "\\HandBrake\\logs";
             string windir = Environment.GetEnvironmentVariable("WINDIR");
-            System.Diagnostics.Process prc = new System.Diagnostics.Process();
-            prc.StartInfo.FileName = windir + @"\explorer.exe";
-            prc.StartInfo.Arguments = logDir;
+            Process prc = new Process
+                              {
+                                  StartInfo =
+                                      {
+                                          FileName = windir + @"\explorer.exe",
+                                          Arguments = logDir
+                                      }
+                              };
             prc.Start();
         }
-        private void btn_copy_Click(object sender, EventArgs e)
-        {
-            if (rtf_actLog.SelectedText != "")
-                Clipboard.SetDataObject(rtf_actLog.SelectedText, true);
-            else
-                Clipboard.SetDataObject(rtf_actLog.Text, true);
-        }
-        private void btn_scan_log_Click(object sender, EventArgs e)
-        {
-            // Switch to the scan log.
-
-            if (monitor != null)
-                monitor.Abort();
 
-            rtf_actLog.Clear();
-            read_file = "last_scan_log.txt";
-            displayLogHeader();
-            startLogThread(read_file);
-            txt_log.Text = "Scan Log";
-        }
-        private void btn_encode_log_Click(object sender, EventArgs e)
+        /// <summary>
+        /// Copy the log
+        /// </summary>
+        /// <param name="sender">
+        /// The sender.
+        /// </param>
+        /// <param name="e">
+        /// The e.
+        /// </param>
+        private void BtnCopyClick(object sender, EventArgs e)
         {
-            // Switch to the encode log
-
-            if (monitor != null)
-                monitor.Abort();
-
-            rtf_actLog.Clear();
-            read_file = "last_encode_log.txt";
-            position = 0;
-            displayLogHeader();
-            startLogThread(read_file);
-            txt_log.Text = "Encode Log";
+            Clipboard.SetDataObject(rtf_actLog.SelectedText != string.Empty ? rtf_actLog.SelectedText : rtf_actLog.Text, true);
         }
 
-        #endregion
-
-        #region System Information
-
-
         /// <summary>
-        /// Returns the total physical ram in a system
+        /// Set scan mode
         /// </summary>
-        /// <returns></returns>
-        public uint TotalPhysicalMemory()
+        /// <param name="sender">
+        /// The sender.
+        /// </param>
+        /// <param name="e">
+        /// The e.
+        /// </param>
+        private void BtnScanLogClick(object sender, EventArgs e)
         {
-            Win32.MEMORYSTATUS memStatus = new Win32.MEMORYSTATUS();
-            Win32.GlobalMemoryStatus(ref memStatus);
-
-            uint MemoryInfo = memStatus.dwTotalPhys;
-            MemoryInfo = MemoryInfo / 1024 / 1024;
-
-            return MemoryInfo;
+            SetMode(ActivityLogMode.Scan);
         }
 
         /// <summary>
-        /// Get the number of CPU Cores
+        /// Set the encode mode
         /// </summary>
-        /// <returns>Object</returns>
-        public Object getCpuCount()
+        /// <param name="sender">
+        /// The sender.
+        /// </param>
+        /// <param name="e">
+        /// The e.
+        /// </param>
+        private void BtnEncodeLogClick(object sender, EventArgs e)
         {
-            RegistryKey RegKey = Registry.LocalMachine;
-            RegKey = RegKey.OpenSubKey("HARDWARE\\DESCRIPTION\\System\\CentralProcessor\\0");
-            return RegKey.GetValue("ProcessorNameString");
+            SetMode(ActivityLogMode.Encode);
         }
 
+        /* Overrides */
+
         /// <summary>
-        /// Get the System screen size information.
+        /// override onclosing
         /// </summary>
-        /// <returns>System.Windows.Forms.Scree</returns>
-        public Screen screenBounds()
+        /// <param name="e">
+        /// The e.
+        /// </param>
+        protected override void OnClosing(CancelEventArgs e)
         {
-            return Screen.PrimaryScreen;
-        }
+            scan.ScanStared -= scan_ScanStared;
+            encode.EncodeStarted -= encode_EncodeStarted;
 
-        #endregion
+            scan.ScanCompleted -= stopWindowRefresh;
+            encode.EncodeEnded -= stopWindowRefresh;
 
+            windowTimer.Dispose();
+            e.Cancel = true;
+            this.Dispose();
+            base.OnClosing(e);
+        }
     }
 }
\ No newline at end of file