Merge branch 'master' of \\\pk2010\Pithos\

[pithos-ms-client] / trunk / Pithos.ShellExtensions / ShellStatusChecker.cs

diff --git a/trunk/Pithos.ShellExtensions/ShellStatusChecker.cs b/trunk/Pithos.ShellExtensions/ShellStatusChecker.cs
index 2464bc8..d746cb6 100644 (file)
--- a/trunk/Pithos.ShellExtensions/ShellStatusChecker.cs
+++ b/trunk/Pithos.ShellExtensions/ShellStatusChecker.cs
@@ -1,11 +1,41 @@
 // -----------------------------------------------------------------------
-// <copyright file="ShellStatusChecker.cs" company="Microsoft">
-// TODO: Update copyright text.
+// <copyright file="ShellStatusChecker.cs" company="GRNet">
+// Copyright 2011-2012 GRNET S.A. All rights reserved.
+// 
+// Redistribution and use in source and binary forms, with or
+// without modification, are permitted provided that the following
+// conditions are met:
+// 
+//   1. Redistributions of source code must retain the above
+//      copyright notice, this list of conditions and the following
+//      disclaimer.
+// 
+//   2. Redistributions in binary form must reproduce the above
+//      copyright notice, this list of conditions and the following
+//      disclaimer in the documentation and/or other materials
+//      provided with the distribution.
+// 
+// THIS SOFTWARE IS PROVIDED BY GRNET S.A. ``AS IS'' AND ANY EXPRESS
+// OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED
+// WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR
+// PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL GRNET S.A OR
+// CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL,
+// SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT
+// LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF
+// USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED
+// AND ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT
+// LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN
+// ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE
+// POSSIBILITY OF SUCH DAMAGE.
+// 
+// The views and conclusions contained in the software and
+// documentation are those of the authors and should not be
+// interpreted as representing official policies, either expressed
+// or implied, of GRNET S.A.
 // </copyright>
 // -----------------------------------------------------------------------
 
 using System.ComponentModel.Composition;
-using System.Diagnostics;
 using System.ServiceModel;
 using Microsoft.Win32;
 using Pithos.Interfaces;
@@ -26,6 +56,8 @@ namespace Pithos.ShellExtensions
         [Import]
         public IPithosSettings Settings { get; set; }
 
+        private static readonly log4net.ILog Log = log4net.LogManager.GetLogger("Pithos.ShellStatusChecker");
+
         public FileOverlayStatus GetFileOverlayStatus(string path)
         {
 
@@ -39,7 +71,7 @@ namespace Pithos.ShellExtensions
             }
             catch (Exception exc)
             {
-                Trace.TraceError("[ERROR] retrieving overlay status for {0}:\r{1}",path,exc);
+                Log.ErrorFormat("[ERROR] retrieving overlay status for {0}:\r{1}",path,exc);
                 return FileOverlayStatus.Unversioned;
             }
         }