Author: spouliot
Date: 2008-02-15 14:50:48 -0500 (Fri, 15 Feb 2008)
New Revision: 95807

Modified:
   trunk/mono-tools/gendarme/framework/Gendarme.Framework/ChangeLog
   trunk/mono-tools/gendarme/framework/Gendarme.Framework/Runner.cs
   trunk/mono-tools/gendarme/framework/Gendarme.Framework/TestRunner.cs
Log:
2008-02-15  Sebastien Pouliot  <[EMAIL PROTECTED]> 

        * Runner.cs: Expose CurrentRule and CurrentTarget
        * TestRunner.cs: Use newly exposed properties.



Modified: trunk/mono-tools/gendarme/framework/Gendarme.Framework/ChangeLog
===================================================================
--- trunk/mono-tools/gendarme/framework/Gendarme.Framework/ChangeLog    
2008-02-15 19:49:10 UTC (rev 95806)
+++ trunk/mono-tools/gendarme/framework/Gendarme.Framework/ChangeLog    
2008-02-15 19:50:48 UTC (rev 95807)
@@ -1,3 +1,8 @@
+2008-02-15  Sebastien Pouliot  <[EMAIL PROTECTED]> 
+
+       * Runner.cs: Expose CurrentRule and CurrentTarget
+       * TestRunner.cs: Use newly exposed properties.
+
 2008-02-15  Sebastien Pouliot  <[EMAIL PROTECTED]>
 
        * MethodSignature.cs

Modified: trunk/mono-tools/gendarme/framework/Gendarme.Framework/Runner.cs
===================================================================
--- trunk/mono-tools/gendarme/framework/Gendarme.Framework/Runner.cs    
2008-02-15 19:49:10 UTC (rev 95806)
+++ trunk/mono-tools/gendarme/framework/Gendarme.Framework/Runner.cs    
2008-02-15 19:50:48 UTC (rev 95807)
@@ -49,10 +49,10 @@
                private IEnumerable<IAssemblyRule> assembly_rules;
                private IEnumerable<ITypeRule> type_rules;
                private IEnumerable<IMethodRule> method_rules;
-               // needed for TestRunner, we'll eventually open our internals 
to a Gendarme test assembly
-               internal IRule currentRule;
-               internal IMetadataTokenProvider currentTarget;
 
+               private IRule currentRule;
+               private IMetadataTokenProvider currentTarget;
+
                private int defectCountBeforeCheck;
 
                public event EventHandler<RunnerEventArgs> AnalyzeAssembly;     
// ??? ProcessAssembly ???
@@ -60,6 +60,16 @@
                public event EventHandler<RunnerEventArgs> AnalyzeType;
                public event EventHandler<RunnerEventArgs> AnalyzeMethod;
 
+               protected IRule CurrentRule {
+                       get { return currentRule; }
+                       set { currentRule = value; }
+               }
+
+               protected IMetadataTokenProvider CurrentTarget {
+                       get { return currentTarget; }
+                       set { currentTarget = value; }
+               }
+
                public Collection<IRule> Rules {
                        get { return rules; }
                }

Modified: trunk/mono-tools/gendarme/framework/Gendarme.Framework/TestRunner.cs
===================================================================
--- trunk/mono-tools/gendarme/framework/Gendarme.Framework/TestRunner.cs        
2008-02-15 19:49:10 UTC (rev 95806)
+++ trunk/mono-tools/gendarme/framework/Gendarme.Framework/TestRunner.cs        
2008-02-15 19:50:48 UTC (rev 95807)
@@ -46,39 +46,29 @@
 
                public TestRunner (IRule rule)
                {
-                       currentRule = rule;
-                       currentRule.Initialize (this);
+                       CurrentRule = rule;
+                       CurrentRule.Initialize (this);
                }
-/*
-               public IRule CurrentRule {
-                       get { return currentRule; }
-                       set { currentRule = value; }
-               }
 
-               public IMetadataTokenProvider CurrentTarget {
-                       get { return currentTarget; }
-                       set { currentTarget = value; }
-               }
-*/
                public RuleResult CheckAssembly (AssemblyDefinition assembly)
                {
                        Reset ();
-                       currentTarget = assembly;
-                       return (currentRule as IAssemblyRule).CheckAssembly 
(assembly);
+                       CurrentTarget = assembly;
+                       return (CurrentRule as IAssemblyRule).CheckAssembly 
(assembly);
                }
 
                public RuleResult CheckType (TypeDefinition type)
                {
                        Reset ();
-                       currentTarget = type;
-                       return (currentRule as ITypeRule).CheckType (type);
+                       CurrentTarget = type;
+                       return (CurrentRule as ITypeRule).CheckType (type);
                }
 
                public RuleResult CheckMethod (MethodDefinition method)
                {
                        Reset ();
-                       currentTarget = method;
-                       return (currentRule as IMethodRule).CheckMethod 
(method);
+                       CurrentTarget = method;
+                       return (CurrentRule as IMethodRule).CheckMethod 
(method);
                }
        }
 }

_______________________________________________
Mono-patches maillist  -  [email protected]
http://lists.ximian.com/mailman/listinfo/mono-patches

Reply via email to