Browse Source

AnalysisProjectOptionsPanel

pull/30/head
PeterForstmeier 14 years ago
parent
commit
e4a0c08d90
  1. 13
      src/AddIns/Analysis/CodeAnalysis/Src/AnalysisProjectOptionsPanelXaml.xaml.cs
  2. 22
      src/AddIns/Analysis/CodeAnalysis/Src/AnalysisProjectOptionsTreeNodes.cs

13
src/AddIns/Analysis/CodeAnalysis/Src/AnalysisProjectOptionsPanelXaml.xaml.cs

@ -140,7 +140,8 @@ namespace ICSharpCode.CodeAnalysis
RuleTreeNode ruleNode; RuleTreeNode ruleNode;
if (rules.TryGetValue(rule, out ruleNode)) { if (rules.TryGetValue(rule, out ruleNode)) {
ruleNode.IsChecked = active; ruleNode.IsChecked = active;
ruleNode.isError = error; //ruleNode.isError = error;
ruleNode.Index = 1;
} }
} }
userCheck = true; userCheck = true;
@ -255,15 +256,7 @@ namespace ICSharpCode.CodeAnalysis
Console.WriteLine("OnPropertyChanged {0}",e.PropertyName); Console.WriteLine("OnPropertyChanged {0}",e.PropertyName);
if (e.PropertyName == "Index") { if (e.PropertyName == "Index") {
base.IsDirty = true; base.IsDirty = true;
// var rule = sender as RuleTreeNode;
// if (rule != null) {
// var cat = rule.Parent as CategoryTreeNode;
// if (cat != null) {
// cat.CheckMode();
// }
// }
} }
} }
} }
@ -311,7 +304,5 @@ namespace ICSharpCode.CodeAnalysis
} }
#endregion #endregion
} }
} }

22
src/AddIns/Analysis/CodeAnalysis/Src/AnalysisProjectOptionsTreeNodes.cs

@ -93,7 +93,6 @@ namespace ICSharpCode.CodeAnalysis
foreach (FxCopRule rule in category.Rules) { foreach (FxCopRule rule in category.Rules) {
this.Children.Add(new RuleTreeNode(rule)); this.Children.Add(new RuleTreeNode(rule));
} }
CheckMode(); CheckMode();
} }
@ -106,6 +105,7 @@ namespace ICSharpCode.CodeAnalysis
get { return category.DisplayName; } get { return category.DisplayName; }
} }
bool ignoreCheckMode;
public override int Index { public override int Index {
get { return base.Index; } get { return base.Index; }
set { set {
@ -113,10 +113,16 @@ namespace ICSharpCode.CodeAnalysis
base.Index = value; base.Index = value;
if (mixedModeTuple == null) { if (mixedModeTuple == null) {
Console.WriteLine("Set all to index"); Console.WriteLine("Set all to index");
ignoreCheckMode = true;
foreach (RuleTreeNode rule in this.Children) { foreach (RuleTreeNode rule in this.Children) {
rule.Index = Index; rule.Index = Index;
} }
base.RaisePropertyChanged("Index"); ignoreCheckMode = false;
// CheckMode();
// base.RaisePropertyChanged("Index");
// foreach (RuleTreeNode rule in this.Children) {
// Console.WriteLine(rule.Index.ToString());
// }
} }
} }
} }
@ -152,20 +158,24 @@ namespace ICSharpCode.CodeAnalysis
public void CheckMode () public void CheckMode ()
{ {
if (! ignoreCheckMode) {
Console.WriteLine("CheckMode"); Console.WriteLine("CheckMode");
if (!NewErrorState.HasValue) { if (!NewErrorState.HasValue) {
Console.WriteLine ("\t{0} is Mixed Mode",Text); Console.WriteLine ("\t{0} is Mixed Mode",Text);
AddMixedMode(); AddMixedMode();
// categoryNode.AddMixedMode(); }
} else{ else{
RemoveMixedMode(); RemoveMixedMode();
/*
if (NewErrorState == true) { if (NewErrorState == true) {
Console.WriteLine ("\t{0} is Error",Text); Console.WriteLine ("\t{0} is Error",Text);
// categoryNode.Index = 1; // Index = 1;
} else { } else {
Console.WriteLine ("\t{0} is Warning",Text); Console.WriteLine ("\t{0} is Warning",Text);
// categoryNode.Index = ; // categoryNode.Index = ;
} }
*/
}
} }
} }
@ -222,6 +232,7 @@ namespace ICSharpCode.CodeAnalysis
get { return error; } get { return error; }
set { set {
error = value; error = value;
// Index = 1;
} }
} }
@ -252,6 +263,7 @@ namespace ICSharpCode.CodeAnalysis
if (base.Index != value) { if (base.Index != value) {
isError = value == 1; isError = value == 1;
base.Index = value; base.Index = value;
RaisePropertyChanged("Index");
var p = Parent as CategoryTreeNode; var p = Parent as CategoryTreeNode;
p.CheckMode(); p.CheckMode();
Console.WriteLine ("RuleNode {0} - index {1} - error {2}",rule.DisplayName,Index, isError); Console.WriteLine ("RuleNode {0} - index {1} - error {2}",rule.DisplayName,Index, isError);

Loading…
Cancel
Save