Code formatting
authorMarek Habersack <grendel@twistedcode.net>
Tue, 7 Apr 2009 08:44:21 +0000 (08:44 -0000)
committerMarek Habersack <grendel@twistedcode.net>
Tue, 7 Apr 2009 08:44:21 +0000 (08:44 -0000)
svn path=/trunk/mcs/; revision=131201

mcs/class/System.Web/System.Web.UI.WebControls/TreeNode.cs
mcs/class/System.Web/System.Web.UI.WebControls/TreeView.cs

index 7812a47696a35de2463c78cb53f5617547a9e59c..2e1fb4a2af08f40c7f93dd5393ef3722de6bc1b0 100644 (file)
@@ -154,9 +154,7 @@ namespace System.Web.UI.WebControls
                [DefaultValue (null)]
                [Browsable (false)]
                public object DataItem {
-                       get {
-                               return dataItem;
-                       }
+                       get { return dataItem; }
                }
                
                [DesignerSerializationVisibility (DesignerSerializationVisibility.Hidden)]
@@ -220,12 +218,11 @@ namespace System.Web.UI.WebControls
                public string ImageToolTip {
                        get {
                                object o = ViewState ["ImageToolTip"];
-                               if (o != null) return (string)o;
-                               return "";
-                       }
-                       set {
-                               ViewState ["ImageToolTip"] = value;
+                               if (o != null)
+                                       return (string)o;
+                               return String.Empty;
                        }
+                       set { ViewState ["ImageToolTip"] = value; }
                }
                
                [DefaultValue ("")]
@@ -234,12 +231,11 @@ namespace System.Web.UI.WebControls
                public string ImageUrl {
                        get {
                                object o = ViewState ["ImageUrl"];
-                               if (o != null) return (string)o;
-                               return "";
-                       }
-                       set {
-                               ViewState ["ImageUrl"] = value;
+                               if (o != null)
+                                       return (string)o;
+                               return String.Empty;
                        }
+                       set { ViewState ["ImageUrl"] = value; }
                }
 
                [DefaultValue ("")]
@@ -248,36 +244,33 @@ namespace System.Web.UI.WebControls
                public string NavigateUrl {
                        get {
                                object o = ViewState ["NavigateUrl"];
-                               if (o != null) return (string)o;
-                               return "";
-                       }
-                       set {
-                               ViewState ["NavigateUrl"] = value;
+                               if (o != null)
+                                       return (string)o;
+                               return String.Empty;
                        }
+                       set { ViewState ["NavigateUrl"] = value; }
                }
 
                [DefaultValue (false)]
                public bool PopulateOnDemand {
                        get {
                                object o = ViewState ["PopulateOnDemand"];
-                               if (o != null) return (bool)o;
+                               if (o != null)
+                                       return (bool)o;
                                return false;
                        }
-                       set {
-                               ViewState ["PopulateOnDemand"] = value;
-                       }
+                       set { ViewState ["PopulateOnDemand"] = value; }
                }
 
                [DefaultValue (TreeNodeSelectAction.Select)]
                public TreeNodeSelectAction SelectAction {
                        get {
                                object o = ViewState ["SelectAction"];
-                               if (o != null) return (TreeNodeSelectAction)o;
+                               if (o != null)
+                                       return (TreeNodeSelectAction)o;
                                return TreeNodeSelectAction.Select;
                        }
-                       set {
-                               ViewState ["SelectAction"] = value;
-                       }
+                       set { ViewState ["SelectAction"] = value; }
                }
 
                [DefaultValue (null)]
@@ -286,9 +279,7 @@ namespace System.Web.UI.WebControls
                                object o = ViewState ["ShowCheckBox"];
                                return (bool?)o;
                        }
-                       set {
-                               ViewState ["ShowCheckBox"] = value;
-                       }
+                       set { ViewState ["ShowCheckBox"] = value; }
                }
 
                internal bool ShowCheckBoxInternal {
@@ -307,12 +298,11 @@ namespace System.Web.UI.WebControls
                public string Target {
                        get {
                                object o = ViewState ["Target"];
-                               if(o != null) return (string)o;
-                               return "";
-                       }
-                       set {
-                               ViewState ["Target"] = value;
+                               if(o != null)
+                                       return (string)o;
+                               return String.Empty;
                        }
+                       set { ViewState ["Target"] = value; }
                }
 
                [Localizable (true)]
@@ -323,12 +313,11 @@ namespace System.Web.UI.WebControls
                                object o = ViewState ["Text"];
                                if (o == null)
                                        o = ViewState ["Value"];
-                               if (o != null) return (string)o;
+                               if (o != null)
+                                       return (string)o;
                                return String.Empty;
                        }
-                       set {
-                               ViewState ["Text"] = value;
-                       }
+                       set { ViewState ["Text"] = value; }
                }
 
                [Localizable (true)]
@@ -336,12 +325,11 @@ namespace System.Web.UI.WebControls
                public string ToolTip {
                        get {
                                object o = ViewState ["ToolTip"];
-                               if(o != null) return (string)o;
-                               return "";
-                       }
-                       set {
-                               ViewState ["ToolTip"] = value;
+                               if(o != null)
+                                       return (string)o;
+                               return String.Empty;
                        }
+                       set { ViewState ["ToolTip"] = value; }
                }
 
                [Localizable (true)]
@@ -351,19 +339,16 @@ namespace System.Web.UI.WebControls
                                object o = ViewState ["Value"];
                                if (o == null)
                                        o = ViewState ["Text"];
-                               if(o != null) return (string)o;
+                               if(o != null)
+                                       return (string)o;
                                return String.Empty;
                        }
-                       set {
-                               ViewState ["Value"] = value;
-                       }
+                       set { ViewState ["Value"] = value; }
                }
                
                [DefaultValue (false)]
                public bool Selected {
-                       get {
-                               return SelectedFlag;
-                       }
+                       get { return SelectedFlag; }
                        set {
                                SelectedFlag = value;
                                
@@ -379,12 +364,11 @@ namespace System.Web.UI.WebControls
                internal virtual bool SelectedFlag {
                        get {
                                object o = ViewState ["Selected"];
-                               if(o != null) return (bool)o;
+                               if(o != null)
+                                       return (bool)o;
                                return false;
                        }
-                       set {
-                               ViewState ["Selected"] = value;
-                       }
+                       set { ViewState ["Selected"] = value; }
                }
                
                [DesignerSerializationVisibility (DesignerSerializationVisibility.Hidden)]
@@ -415,14 +399,16 @@ namespace System.Web.UI.WebControls
                        set { index = value; ResetPathData (); }
                }
                
-               internal void SetParent (TreeNode node) {
+               internal void SetParent (TreeNode node)
+               {
                        parent = node;
                        ResetPathData ();
                }
                
                internal string Path {
                        get {
-                               if (path != null) return path;
+                               if (path != null)
+                                       return path;
                                StringBuilder sb = new StringBuilder (index.ToString());
                                TreeNode node = parent;
                                while (node != null) {
@@ -438,12 +424,11 @@ namespace System.Web.UI.WebControls
                internal bool Populated {
                        get {
                                object o = ViewState ["Populated"];
-                               if (o != null) return (bool) o;
+                               if (o != null)
+                                       return (bool) o;
                                return false;
                        }
-                       set {
-                               ViewState ["Populated"] = value;
-                       }
+                       set { ViewState ["Populated"] = value; }
                }
 
                internal bool HasChildData {
@@ -487,7 +472,8 @@ namespace System.Web.UI.WebControls
                void SetExpandedRec (bool expanded, int depth)
                {
                        Expanded = expanded;
-                       if (depth == 0) return;
+                       if (depth == 0)
+                               return;
                        
                        foreach (TreeNode nod in ChildNodes)
                                nod.SetExpandedRec (expanded, depth - 1);
@@ -565,8 +551,7 @@ namespace System.Web.UI.WebControls
                        get { return IsTrackingViewState; }
                }
 
-               protected bool IsTrackingViewState
-               {
+               protected bool IsTrackingViewState {
                        get { return marked; }
                }
                
@@ -589,7 +574,8 @@ namespace System.Web.UI.WebControls
                        return nod;
                }
 
-               object ICloneable.Clone () {
+               object ICloneable.Clone ()
+               {
                        return Clone ();
                }
                
@@ -609,8 +595,7 @@ namespace System.Web.UI.WebControls
                                        ImageToolTip = Convert.ToString (GetBoundPropertyValue (bin.ImageToolTipField));
                                        if (ImageToolTip.Length == 0)
                                                ImageToolTip = bin.ImageToolTip;
-                               }
-                               else if (bin.ImageToolTip.Length > 0)
+                               } else if (bin.ImageToolTip.Length > 0)
                                        ImageToolTip = bin.ImageToolTip;
                                        
                                // Bind ImageUrl property
@@ -619,8 +604,7 @@ namespace System.Web.UI.WebControls
                                        ImageUrl = Convert.ToString (GetBoundPropertyValue (bin.ImageUrlField));
                                        if (ImageUrl.Length == 0)
                                                ImageUrl = bin.ImageUrl;
-                               }
-                               else if (bin.ImageUrl.Length > 0)
+                               } else if (bin.ImageUrl.Length > 0)
                                        ImageUrl = bin.ImageUrl;
                                        
                                // Bind NavigateUrl property
@@ -629,8 +613,7 @@ namespace System.Web.UI.WebControls
                                        NavigateUrl = Convert.ToString (GetBoundPropertyValue (bin.NavigateUrlField));
                                        if (NavigateUrl.Length == 0)
                                                NavigateUrl = bin.NavigateUrl;
-                               }
-                               else if (bin.NavigateUrl.Length > 0)
+                               } else if (bin.NavigateUrl.Length > 0)
                                        NavigateUrl = bin.NavigateUrl;
                                        
                                // Bind PopulateOnDemand property
@@ -654,8 +637,7 @@ namespace System.Web.UI.WebControls
                                        Target = Convert.ToString (GetBoundPropertyValue (bin.TargetField));
                                        if (Target.Length == 0)
                                                Target = bin.Target;
-                               }
-                               else if (bin.Target.Length > 0)
+                               } else if (bin.Target.Length > 0)
                                        Target = bin.Target;
                                        
                                // Bind Text property
@@ -680,8 +662,7 @@ namespace System.Web.UI.WebControls
                                        ToolTip = Convert.ToString (GetBoundPropertyValue (bin.ToolTipField));
                                        if (ToolTip.Length == 0)
                                                ToolTip = bin.ToolTip;
-                               }
-                               else if (bin.ToolTip.Length > 0)
+                               } else if (bin.ToolTip.Length > 0)
                                        ToolTip = bin.ToolTip;
                                        
                                // Bind Value property
@@ -697,8 +678,7 @@ namespace System.Web.UI.WebControls
                                }
                                if (!String.IsNullOrEmpty (value))
                                        Value = value;
-                       }
-                       else {
+                       } else {
                                Text = Value = GetDefaultBoundText ();
                        }
 
@@ -728,16 +708,22 @@ namespace System.Web.UI.WebControls
                
                string GetDefaultBoundText ()
                {
-                       if (hierarchyData != null) return hierarchyData.ToString ();
-                       else if (dataItem != null) return dataItem.ToString ();
-                       else return string.Empty;
+                       if (hierarchyData != null)
+                               return hierarchyData.ToString ();
+                       else if (dataItem != null)
+                               return dataItem.ToString ();
+                       else
+                               return string.Empty;
                }
                
                string GetDataItemType ()
                {
-                       if (hierarchyData != null) return hierarchyData.Type;
-                       else if (dataItem != null) return dataItem.GetType().ToString ();
-                       else return string.Empty;
+                       if (hierarchyData != null)
+                               return hierarchyData.Type;
+                       else if (dataItem != null)
+                               return dataItem.GetType().ToString ();
+                       else
+                               return string.Empty;
                }
                                
                internal bool IsParentNode {
@@ -754,8 +740,10 @@ namespace System.Web.UI.WebControls
                
                TreeNodeBinding GetBinding ()
                {
-                       if (tree == null) return null;
-                       if (gotBinding) return binding;
+                       if (tree == null)
+                               return null;
+                       if (gotBinding)
+                               return binding;
                        binding = tree.FindBindingForNode (GetDataItemType (), Depth);
                        gotBinding = true;
                        return binding;
@@ -799,5 +787,4 @@ namespace System.Web.UI.WebControls
                }
        }
 }
-
 #endif
index 6c022c1441328fac07ed7862056278968c55e183..60b3b1974e5903f2d8c6846321a09f6722bc86ae 100644 (file)
@@ -157,7 +157,8 @@ namespace System.Web.UI.WebControls
                
                class ImageStyle
                {
-                       public ImageStyle (string expand, string collapse, string noExpand, string icon, string iconLeaf, string iconRoot) {
+                       public ImageStyle (string expand, string collapse, string noExpand, string icon, string iconLeaf, string iconRoot)
+                       {
                                Expand = expand;
                                Collapse = collapse;
                                NoExpand = noExpand;
@@ -229,7 +230,8 @@ namespace System.Web.UI.WebControls
                {
                        if (Events != null) {
                                TreeNodeEventHandler eh = (TreeNodeEventHandler) Events [TreeNodeCheckChangedEvent];
-                               if (eh != null) eh (this, e);
+                               if (eh != null)
+                                       eh (this, e);
                        }
                }
 
@@ -237,7 +239,8 @@ namespace System.Web.UI.WebControls
                {
                        if (Events != null) {
                                EventHandler eh = (EventHandler) Events [SelectedNodeChangedEvent];
-                               if (eh != null) eh (this, e);
+                               if (eh != null)
+                                       eh (this, e);
                        }
                }
 
@@ -245,7 +248,8 @@ namespace System.Web.UI.WebControls
                {
                        if (Events != null) {
                                TreeNodeEventHandler eh = (TreeNodeEventHandler) Events [TreeNodeCollapsedEvent];
-                               if (eh != null) eh (this, e);
+                               if (eh != null)
+                                       eh (this, e);
                        }
                }
 
@@ -253,7 +257,8 @@ namespace System.Web.UI.WebControls
                {
                        if (Events != null) {
                                TreeNodeEventHandler eh = (TreeNodeEventHandler) Events [TreeNodeDataBoundEvent];
-                               if (eh != null) eh (this, e);
+                               if (eh != null)
+                                       eh (this, e);
                        }
                }
 
@@ -261,7 +266,8 @@ namespace System.Web.UI.WebControls
                {
                        if (Events != null) {
                                TreeNodeEventHandler eh = (TreeNodeEventHandler) Events [TreeNodeExpandedEvent];
-                               if (eh != null) eh (this, e);
+                               if (eh != null)
+                                       eh (this, e);
                        }
                }
 
@@ -269,19 +275,16 @@ namespace System.Web.UI.WebControls
                {
                        if (Events != null) {
                                TreeNodeEventHandler eh = (TreeNodeEventHandler) Events [TreeNodePopulateEvent];
-                               if (eh != null) eh (this, e);
+                               if (eh != null)
+                                       eh (this, e);
                        }
                }
 
 
                [Localizable (true)]
                public string CollapseImageToolTip {
-                       get {
-                               return ViewState.GetString ("CollapseImageToolTip", "Collapse {0}");
-                       }
-                       set {
-                               ViewState["CollapseImageToolTip"] = value;
-                       }
+                       get { return ViewState.GetString ("CollapseImageToolTip", "Collapse {0}"); }
+                       set { ViewState["CollapseImageToolTip"] = value; }
                }
 
                [MonoTODO ("Implement support for this")]
@@ -289,12 +292,8 @@ namespace System.Web.UI.WebControls
                [WebSysDescription ("Whether the tree will automatically generate bindings.")]
                [DefaultValue (true)]
                public bool AutoGenerateDataBindings {
-                       get {
-                               return ViewState.GetBool ("AutoGenerateDataBindings", true);
-                       }
-                       set {
-                               ViewState["AutoGenerateDataBindings"] = value;
-                       }
+                       get { return ViewState.GetBool ("AutoGenerateDataBindings", true); }
+                       set { ViewState["AutoGenerateDataBindings"] = value; }
                }
 
                [DefaultValue ("")]
@@ -303,12 +302,8 @@ namespace System.Web.UI.WebControls
                [WebCategory ("Appearance")]
                [Editor ("System.Web.UI.Design.ImageUrlEditor, " + Consts.AssemblySystem_Design, "System.Drawing.Design.UITypeEditor, " + Consts.AssemblySystem_Drawing)]
                public string CollapseImageUrl {
-                       get {
-                               return ViewState.GetString ("CollapseImageUrl", "");
-                       }
-                       set {
-                               ViewState["CollapseImageUrl"] = value;
-                       }
+                       get { return ViewState.GetString ("CollapseImageUrl", String.Empty); }
+                       set { ViewState["CollapseImageUrl"] = value; }
                }
 
                [WebCategory ("Data")]
@@ -333,12 +328,8 @@ namespace System.Web.UI.WebControls
                [Themeable (false)]
                [DefaultValue (true)]
                public bool EnableClientScript {
-                       get {
-                               return ViewState.GetBool ("EnableClientScript", true);
-                       }
-                       set {
-                               ViewState["EnableClientScript"] = value;
-                       }
+                       get { return ViewState.GetBool ("EnableClientScript", true); }
+                       set { ViewState["EnableClientScript"] = value; }
                }
 
                [DefaultValue (-1)]
@@ -346,22 +337,14 @@ namespace System.Web.UI.WebControls
                [WebSysDescription ("The initial expand depth.")]
                [TypeConverter ("System.Web.UI.WebControls.TreeView+TreeViewExpandDepthConverter, " + Consts.AssemblySystem_Web)]
                public int ExpandDepth {
-                       get {
-                               return ViewState.GetInt ("ExpandDepth", -1);
-                       }
-                       set {
-                               ViewState["ExpandDepth"] = value;
-                       }
+                       get { return ViewState.GetInt ("ExpandDepth", -1); }
+                       set { ViewState["ExpandDepth"] = value; }
                }
 
                [Localizable (true)]
                public string ExpandImageToolTip {
-                       get {
-                               return ViewState.GetString ("ExpandImageToolTip", "Expand {0}");
-                       }
-                       set {
-                               ViewState["ExpandImageToolTip"] = value;
-                       }
+                       get { return ViewState.GetString ("ExpandImageToolTip", "Expand {0}"); }
+                       set { ViewState["ExpandImageToolTip"] = value; }
                }
 
                [DefaultValue ("")]
@@ -370,12 +353,8 @@ namespace System.Web.UI.WebControls
                [WebCategory ("Appearance")]
                [Editor ("System.Web.UI.Design.ImageUrlEditor, " + Consts.AssemblySystem_Design, "System.Drawing.Design.UITypeEditor, " + Consts.AssemblySystem_Drawing)]
                public string ExpandImageUrl {
-                       get {
-                               return ViewState.GetString ("ExpandImageUrl", "");
-                       }
-                       set {
-                               ViewState["ExpandImageUrl"] = value;
-                       }
+                       get { return ViewState.GetString ("ExpandImageUrl", String.Empty); }
+                       set { ViewState["ExpandImageUrl"] = value; }
                }
 
                [PersistenceMode (PersistenceMode.InnerProperty)]
@@ -396,9 +375,7 @@ namespace System.Web.UI.WebControls
 
                [DefaultValue (TreeViewImageSet.Custom)]
                public TreeViewImageSet ImageSet {
-                       get {
-                               return (TreeViewImageSet)ViewState.GetInt ("ImageSet", (int)TreeViewImageSet.Custom);
-                       }
+                       get { return (TreeViewImageSet)ViewState.GetInt ("ImageSet", (int)TreeViewImageSet.Custom); }
                        set {
                                if (!Enum.IsDefined (typeof (TreeViewImageSet), value))
                                        throw new ArgumentOutOfRangeException ();
@@ -439,32 +416,20 @@ namespace System.Web.UI.WebControls
 
                [DefaultValue ("")]
                public string LineImagesFolder {
-                       get {
-                               return ViewState.GetString ("LineImagesFolder", "");
-                       }
-                       set {
-                               ViewState["LineImagesFolder"] = value;
-                       }
+                       get { return ViewState.GetString ("LineImagesFolder", String.Empty); }
+                       set { ViewState["LineImagesFolder"] = value; }
                }
 
                [DefaultValue (-1)]
                public int MaxDataBindDepth {
-                       get {
-                               return ViewState.GetInt ("MaxDataBindDepth", -1);
-                       }
-                       set {
-                               ViewState["MaxDataBindDepth"] = value;
-                       }
+                       get { return ViewState.GetInt ("MaxDataBindDepth", -1); }
+                       set { ViewState["MaxDataBindDepth"] = value; }
                }
 
                [DefaultValue (20)]
                public int NodeIndent {
-                       get {
-                               return ViewState.GetInt ("NodeIndent", 20);
-                       }
-                       set {
-                               ViewState["NodeIndent"] = value;
-                       }
+                       get { return ViewState.GetInt ("NodeIndent", 20); }
+                       set { ViewState["NodeIndent"] = value; }
                }
                
                [PersistenceMode (PersistenceMode.InnerProperty)]
@@ -500,12 +465,8 @@ namespace System.Web.UI.WebControls
                
                [DefaultValue (false)]
                public bool NodeWrap {
-                       get {
-                               return ViewState.GetBool ("NodeWrap", false);
-                       }
-                       set {
-                               ViewState ["NodeWrap"] = value;
-                       }
+                       get { return ViewState.GetBool ("NodeWrap", false); }
+                       set { ViewState ["NodeWrap"] = value; }
                }
 
                [UrlProperty]
@@ -514,12 +475,8 @@ namespace System.Web.UI.WebControls
                [WebCategory ("Appearance")]
                [Editor ("System.Web.UI.Design.ImageUrlEditor, " + Consts.AssemblySystem_Design, "System.Drawing.Design.UITypeEditor, " + Consts.AssemblySystem_Drawing)]
                public string NoExpandImageUrl {
-                       get {
-                               return ViewState.GetString ("NoExpandImageUrl", "");
-                       }
-                       set {
-                               ViewState ["NoExpandImageUrl"] = value;
-                       }
+                       get { return ViewState.GetString ("NoExpandImageUrl", String.Empty); }
+                       set { ViewState ["NoExpandImageUrl"] = value; }
                }
 
                [PersistenceMode (PersistenceMode.InnerProperty)]
@@ -540,22 +497,14 @@ namespace System.Web.UI.WebControls
                
                [DefaultValue ('/')]
                public char PathSeparator {
-                       get {
-                               return ViewState.GetChar ("PathSeparator", '/');
-                       }
-                       set {
-                               ViewState ["PathSeparator"] = value;
-                       }
+                       get { return ViewState.GetChar ("PathSeparator", '/'); }
+                       set { ViewState ["PathSeparator"] = value; }
                }
 
                [DefaultValue (true)]
                public bool PopulateNodesFromClient {
-                       get {
-                               return ViewState.GetBool ("PopulateNodesFromClient", true);
-                       }
-                       set {
-                               ViewState ["PopulateNodesFromClient"] = value;
-                       }
+                       get { return ViewState.GetBool ("PopulateNodesFromClient", true); }
+                       set { ViewState ["PopulateNodesFromClient"] = value; }
                }
 
                [PersistenceMode (PersistenceMode.InnerProperty)]
@@ -611,54 +560,47 @@ namespace System.Web.UI.WebControls
 
                Style RootNodeLinkStyle {
                        get {
-                               if (rootNodeLinkStyle == null) {
+                               if (rootNodeLinkStyle == null)
                                        rootNodeLinkStyle = new Style ();
-                               }
                                return rootNodeLinkStyle;
                        }
                }
 
                Style ParentNodeLinkStyle {
                        get {
-                               if (parentNodeLinkStyle == null) {
+                               if (parentNodeLinkStyle == null)
                                        parentNodeLinkStyle = new Style ();
-                               }
                                return parentNodeLinkStyle;
                        }
                }
 
                Style SelectedNodeLinkStyle {
                        get {
-                               if (selectedNodeLinkStyle == null) {
+                               if (selectedNodeLinkStyle == null)
                                        selectedNodeLinkStyle = new Style ();
-                               }
                                return selectedNodeLinkStyle;
                        }
                }
 
                Style LeafNodeLinkStyle {
                        get {
-                               if (leafNodeLinkStyle == null) {
+                               if (leafNodeLinkStyle == null)
                                        leafNodeLinkStyle = new Style ();
-                               }
                                return leafNodeLinkStyle;
                        }
                }
 
                Style HoverNodeLinkStyle {
                        get {
-                               if (hoverNodeLinkStyle == null) {
+                               if (hoverNodeLinkStyle == null)
                                        hoverNodeLinkStyle = new Style ();
-                               }
                                return hoverNodeLinkStyle;
                        }
                }
                
                [DefaultValue (TreeNodeTypes.None)]
                public TreeNodeTypes ShowCheckBoxes {
-                       get {
-                               return (TreeNodeTypes)ViewState.GetInt ("ShowCheckBoxes", (int)TreeNodeTypes.None);
-                       }
+                       get { return (TreeNodeTypes)ViewState.GetInt ("ShowCheckBoxes", (int)TreeNodeTypes.None); }
                        set {
                                if ((int) value > 7)
                                        throw new ArgumentOutOfRangeException ();
@@ -668,33 +610,21 @@ namespace System.Web.UI.WebControls
 
                [DefaultValue (true)]
                public bool ShowExpandCollapse {
-                       get {
-                               return ViewState.GetBool ("ShowExpandCollapse", true);
-                       }
-                       set {
-                               ViewState ["ShowExpandCollapse"] = value;
-                       }
+                       get { return ViewState.GetBool ("ShowExpandCollapse", true); }
+                       set { ViewState ["ShowExpandCollapse"] = value; }
                }
 
                [DefaultValue (false)]
                public bool ShowLines {
-                       get {
-                               return ViewState.GetBool ("ShowLines", false);
-                       }
-                       set {
-                               ViewState ["ShowLines"] = value;
-                       }
+                       get { return ViewState.GetBool ("ShowLines", false); }
+                       set { ViewState ["ShowLines"] = value; }
                }
 
                [Localizable (true)]
                public string SkipLinkText
                {
-                       get {
-                               return ViewState.GetString ("SkipLinkText", "Skip Navigation Links.");
-                       }
-                       set {
-                               ViewState ["SkipLinkText"] = value;
-                       }
+                       get { return ViewState.GetString ("SkipLinkText", "Skip Navigation Links."); }
+                       set { ViewState ["SkipLinkText"] = value; }
                }
                
                
@@ -708,28 +638,20 @@ namespace System.Web.UI.WebControls
                [DefaultValue ("")]
                [DesignerSerializationVisibility (DesignerSerializationVisibility.Hidden)]
                public string SelectedValue {
-                       get { return selectedNode != null ? selectedNode.Value : ""; }
+                       get { return selectedNode != null ? selectedNode.Value : String.Empty; }
                }
 
                [DefaultValue ("")]
                public string Target {
-                       get {
-                               return ViewState.GetString ("Target", "");
-                       }
-                       set {
-                               ViewState ["Target"] = value;
-                       }
+                       get { return ViewState.GetString ("Target", String.Empty); }
+                       set { ViewState ["Target"] = value; }
                }
 
                [MonoTODO ("why override?")]
                public override bool Visible 
                {
-                       get {
-                               return base.Visible;
-                       }
-                       set {
-                               base.Visible = value;
-                       }
+                       get { return base.Visible; }
+                       set { base.Visible = value; }
                }
                                
                [Browsable (false)]
@@ -745,7 +667,8 @@ namespace System.Web.UI.WebControls
                void FindCheckedNodes (TreeNodeCollection nodeList, TreeNodeCollection result)
                {
                        foreach (TreeNode node in nodeList) {
-                               if (node.Checked) result.Add (node, false);
+                               if (node.Checked)
+                                       result.Add (node, false);
                                FindCheckedNodes (node.ChildNodes, result);
                        }
                }
@@ -764,7 +687,8 @@ namespace System.Web.UI.WebControls
                
                public TreeNode FindNode (string valuePath)
                {
-                       if (valuePath == null) throw new ArgumentNullException ("valuePath");
+                       if (valuePath == null)
+                               throw new ArgumentNullException ("valuePath");
                        string[] path = valuePath.Split (PathSeparator);
                        int n = 0;
                        TreeNodeCollection col = Nodes;
@@ -773,7 +697,8 @@ namespace System.Web.UI.WebControls
                                foundBranch = false;
                                foreach (TreeNode node in col) {
                                        if (node.Value == path [n]) {
-                                               if (++n == path.Length) return node;
+                                               if (++n == path.Length)
+                                                       return node;
                                                col = node.ChildNodes;
                                                foundBranch = true;
                                                break;
@@ -827,7 +752,8 @@ namespace System.Web.UI.WebControls
                
                internal void SetSelectedNode (TreeNode node, bool loading)
                {
-                       if (selectedNode == node) return;
+                       if (selectedNode == node)
+                               return;
                        if (selectedNode != null)
                                selectedNode.SelectedFlag = false;
                        selectedNode = node;
@@ -858,33 +784,24 @@ namespace System.Web.UI.WebControls
                        EnsureDataBound ();
                        
                        base.TrackViewState();
-                       if (hoverNodeStyle != null) {
+                       if (hoverNodeStyle != null)
                                hoverNodeStyle.TrackViewState();
-                       }
-                       if (leafNodeStyle != null) {
+                       if (leafNodeStyle != null)
                                leafNodeStyle.TrackViewState();
-                       }
-                       if (levelStyles != null && levelStyles.Count > 0) {
+                       if (levelStyles != null && levelStyles.Count > 0)
                                ((IStateManager)levelStyles).TrackViewState();
-                       }
-                       if (nodeStyle != null) {
+                       if (nodeStyle != null)
                                nodeStyle.TrackViewState();
-                       }
-                       if (parentNodeStyle != null) {
+                       if (parentNodeStyle != null)
                                parentNodeStyle.TrackViewState();
-                       }
-                       if (rootNodeStyle != null) {
+                       if (rootNodeStyle != null)
                                rootNodeStyle.TrackViewState();
-                       }
-                       if (selectedNodeStyle != null) {
+                       if (selectedNodeStyle != null)
                                selectedNodeStyle.TrackViewState();
-                       }
-                       if (dataBindings != null) {
+                       if (dataBindings != null)
                                ((IStateManager)dataBindings).TrackViewState ();
-                       }
-                       if (nodes != null) {
+                       if (nodes != null)
                                ((IStateManager)nodes).TrackViewState();;
-                       }
                }
 
                protected override object SaveViewState()
@@ -942,7 +859,8 @@ namespace System.Web.UI.WebControls
                        ValidateEvent (UniqueID, eventArgument);
                        string[] args = eventArgument.Split ('|');
                        TreeNode node = FindNodeByPos (args[1]);
-                       if (node == null) return;
+                       if (node == null)
+                               return;
                        
                        if (args [0] == "sel")
                                HandleSelectEvent (node);
@@ -1070,7 +988,7 @@ namespace System.Web.UI.WebControls
                {
                        base.PerformDataBinding ();
                        InitializeDataBindings ();
-                       HierarchicalDataSourceView data = GetData ("");
+                       HierarchicalDataSourceView data = GetData (String.Empty);
                        if (data == null)
                                return;
                        Nodes.Clear ();
@@ -1128,8 +1046,7 @@ namespace System.Web.UI.WebControls
                                        string[] ids = states.Split ('|');
                                        UnsetExpandStates (Nodes, ids);
                                        SetExpandStates (ids);
-                               }
-                               else
+                               } else
                                        UnsetExpandStates (Nodes, new string[0]);
                                res = true;
                        }
@@ -1218,9 +1135,8 @@ namespace System.Web.UI.WebControls
                                                     ClientScriptManager.GetScriptLiteral (GetNodeImageToolTip (true, null)),
                                                     ClientScriptManager.GetScriptLiteral (GetNodeImageToolTip (false, null)));
                                
-                               if (!Page.IsPostBack) {
+                               if (!Page.IsPostBack)
                                        SetNodesExpandedToDepthRecursive (Nodes);
-                               }
 
                                if (EnableClientScript) {
                                        Page.ClientScript.RegisterHiddenField (ClientID + "_ExpandStates", GetExpandStates ());
@@ -1229,9 +1145,8 @@ namespace System.Web.UI.WebControls
                                        Page.ClientScript.RegisterWebFormClientScript ();
                                }
 
-                               if (EnableClientScript && PopulateNodesFromClient) {
+                               if (EnableClientScript && PopulateNodesFromClient)
                                        Page.ClientScript.RegisterHiddenField (ClientID + "_PopulatedStates", "|");
-                               }
 
                                EnsureStylesPrepared ();
 
@@ -1250,14 +1165,16 @@ namespace System.Web.UI.WebControls
                        }
                }
 
-               void EnsureStylesPrepared () {
+               void EnsureStylesPrepared ()
+               {
                        if (stylesPrepared)
                                return;
                        stylesPrepared = true;
                        PrepareStyles ();
                }
 
-               void PrepareStyles () {
+               void PrepareStyles ()
+               {
                        // The order in which styles are defined matters when more than one class
                        // is assigned to an element
                        ControlLinkStyle.CopyTextStylesFrom (ControlStyle);
@@ -1289,7 +1206,8 @@ namespace System.Web.UI.WebControls
                                RegisterStyle (SelectedNodeStyle, SelectedNodeLinkStyle);
                }
 
-               void SetNodesExpandedToDepthRecursive (TreeNodeCollection nodes) {
+               void SetNodesExpandedToDepthRecursive (TreeNodeCollection nodes)
+               {
                        foreach (TreeNode node in nodes) {
                                if (!node.Expanded.HasValue) {
                                        if (ExpandDepth < 0 || node.Depth < ExpandDepth)
@@ -1299,12 +1217,14 @@ namespace System.Web.UI.WebControls
                        }
                }
 
-               string IncrementStyleClassName () {
+               string IncrementStyleClassName ()
+               {
                        registeredStylesCounter++;
                        return ClientID + "_" + registeredStylesCounter;
                }
 
-               void RegisterStyle (Style baseStyle, Style linkStyle) {
+               void RegisterStyle (Style baseStyle, Style linkStyle)
+               {
                        linkStyle.CopyTextStylesFrom (baseStyle);
                        linkStyle.BorderStyle = BorderStyle.None;
                        baseStyle.Font.Reset ();
@@ -1312,7 +1232,8 @@ namespace System.Web.UI.WebControls
                        RegisterStyle (baseStyle);
                }
 
-               void RegisterStyle (Style baseStyle) {
+               void RegisterStyle (Style baseStyle)
+               {
                        if (Page.Header == null)
                                return;
                        string className = IncrementStyleClassName ().Trim ('_');
@@ -1325,7 +1246,8 @@ namespace System.Web.UI.WebControls
                        return dataMember + " " + depth;
                }
                
-               void InitializeDataBindings () {
+               void InitializeDataBindings ()
+               {
                        if (dataBindings != null && dataBindings.Count > 0) {
                                bindings = new Hashtable ();
                                foreach (TreeNodeBinding bin in dataBindings) {
@@ -1333,8 +1255,7 @@ namespace System.Web.UI.WebControls
                                        if (!bindings.ContainsKey(key))
                                                bindings [key] = bin;
                                }
-                       }
-                       else
+                       } else
                                bindings = null;
                }
                
@@ -1344,15 +1265,18 @@ namespace System.Web.UI.WebControls
                                return null;
                                
                        TreeNodeBinding bin = (TreeNodeBinding) bindings [GetBindingKey (type, depth)];
-                       if (bin != null) return bin;
+                       if (bin != null)
+                               return bin;
                        
                        bin = (TreeNodeBinding) bindings [GetBindingKey (type, -1)];
-                       if (bin != null) return bin;
+                       if (bin != null)
+                               return bin;
                        
-                       bin = (TreeNodeBinding) bindings [GetBindingKey ("", depth)];
-                       if (bin != null) return bin;
+                       bin = (TreeNodeBinding) bindings [GetBindingKey (String.Empty, depth)];
+                       if (bin != null)
+                               return bin;
                        
-                       return (TreeNodeBinding) bindings [GetBindingKey ("", -1)];
+                       return (TreeNodeBinding) bindings [GetBindingKey (String.Empty, -1)];
                }
                
                internal void DecorateNode(TreeNode node)
@@ -1399,7 +1323,9 @@ namespace System.Web.UI.WebControls
                
                public override void RenderBeginTag (HtmlTextWriter writer)
                {
-                       if (SkipLinkText != "") {
+                       string skipLinkText = SkipLinkText;
+                       
+                       if (!String.IsNullOrEmpty (skipLinkText)) {
                                writer.AddAttribute (HtmlTextWriterAttribute.Href, "#" + ClientID + "_SkipLink");
                                writer.RenderBeginTag (HtmlTextWriterTag.A);
 
@@ -1408,7 +1334,7 @@ namespace System.Web.UI.WebControls
                                img.ImageUrl = csm.GetWebResourceUrl (typeof (SiteMapPath), "transparent.gif");
                                img.Attributes.Add ("height", "0");
                                img.Attributes.Add ("width", "0");
-                               img.AlternateText = SkipLinkText;
+                               img.AlternateText = skipLinkText;
                                img.Render (writer);
 
                                writer.RenderEndTag ();
@@ -1420,7 +1346,7 @@ namespace System.Web.UI.WebControls
                {
                        base.RenderEndTag (writer);
 
-                       if (SkipLinkText != "") {
+                       if (!String.IsNullOrEmpty (SkipLinkText)) {
                                writer.AddAttribute (HtmlTextWriterAttribute.Id, ClientID + "_SkipLink");
                                writer.RenderBeginTag (HtmlTextWriterTag.A);
                                writer.RenderEndTag ();
@@ -1468,7 +1394,7 @@ namespace System.Web.UI.WebControls
                                writer.RenderBeginTag (HtmlTextWriterTag.Div);
                                if (ShowLines && levelLines [n] != null) {
                                        writer.AddAttribute ("src", nodeImage);
-                                       writer.AddAttribute (HtmlTextWriterAttribute.Alt, "", false);
+                                       writer.AddAttribute (HtmlTextWriterAttribute.Alt, String.Empty, false);
                                        writer.RenderBeginTag (HtmlTextWriterTag.Img);
                                        writer.RenderEndTag ();
                                }
@@ -1477,30 +1403,37 @@ namespace System.Web.UI.WebControls
                        }
                        
                        // Node image + line
-                       
-                       if (ShowExpandCollapse || ShowLines) {
+                       bool showExpandCollapse = ShowExpandCollapse;
+                       bool showLines = ShowLines;
+                       if (showExpandCollapse || showLines) {
                                bool buttonImage = false;
-                               string tooltip = "";
-                               string shape = "";
+                               string tooltip = String.Empty;
+                               string shape = String.Empty;
                                
-                               if (ShowLines) {
-                                       if (hasPrevious && hasNext) shape = "t";
-                                       else if (hasPrevious && !hasNext) shape = "l";
-                                       else if (!hasPrevious && hasNext) shape = "r";
-                                       else shape = "dash";
+                               if (showLines) {
+                                       if (hasPrevious && hasNext)
+                                               shape = "t";
+                                       else if (hasPrevious && !hasNext)
+                                               shape = "l";
+                                       else if (!hasPrevious && hasNext)
+                                               shape = "r";
+                                       else
+                                               shape = "dash";
                                }
                                
-                               if (ShowExpandCollapse) {
+                               if (showExpandCollapse) {
                                        if (hasChildNodes) {
                                                buttonImage = true;
-                                               if (node.Expanded.HasValue && node.Expanded.Value) shape += "minus";
-                                               else shape += "plus";
+                                               if (node.Expanded.HasValue && node.Expanded.Value)
+                                                       shape += "minus";
+                                               else
+                                                       shape += "plus";
                                                tooltip = GetNodeImageToolTip (!(node.Expanded.HasValue && node.Expanded.Value), node.Text);
-                                       } else if (!ShowLines)
+                                       } else if (!showLines)
                                                shape = "noexpand";
                                }
 
-                               if (shape != "") {
+                               if (!String.IsNullOrEmpty (shape)) {
                                        nodeImage = GetNodeImageUrl (shape, imageStyle);
                                        writer.RenderBeginTag (HtmlTextWriterTag.Td);   // TD
                                        
@@ -1674,7 +1607,8 @@ namespace System.Web.UI.WebControls
                        writer.RenderEndTag (); // table
                }
                
-               void RenderMenuItemSpacing (HtmlTextWriter writer, Unit itemSpacing) {
+               void RenderMenuItemSpacing (HtmlTextWriter writer, Unit itemSpacing)
+               {
                        writer.AddStyleAttribute ("height", itemSpacing.ToString ());
                        writer.RenderBeginTag (HtmlTextWriterTag.Tr);
                        writer.RenderBeginTag (HtmlTextWriterTag.Td);
@@ -1682,24 +1616,21 @@ namespace System.Web.UI.WebControls
                        writer.RenderEndTag ();
                }
 
-               Unit GetNodeSpacing (TreeNode node) {
-                       if (node.Selected && selectedNodeStyle != null && selectedNodeStyle.NodeSpacing != Unit.Empty) {
+               Unit GetNodeSpacing (TreeNode node)
+               {
+                       if (node.Selected && selectedNodeStyle != null && selectedNodeStyle.NodeSpacing != Unit.Empty)
                                return selectedNodeStyle.NodeSpacing;
-                       }
 
-                       if (levelStyles != null && node.Depth < levelStyles.Count && levelStyles [node.Depth].NodeSpacing != Unit.Empty) {
+                       if (levelStyles != null && node.Depth < levelStyles.Count && levelStyles [node.Depth].NodeSpacing != Unit.Empty)
                                return levelStyles [node.Depth].NodeSpacing;
-                       }
 
                        if (node.IsLeafNode) {
                                if (leafNodeStyle != null && leafNodeStyle.NodeSpacing != Unit.Empty)
                                        return leafNodeStyle.NodeSpacing;
-                       }
-                       else if (node.IsRootNode) {
+                       } else if (node.IsRootNode) {
                                if (rootNodeStyle != null && rootNodeStyle.NodeSpacing != Unit.Empty)
                                        return rootNodeStyle.NodeSpacing;
-                       }
-                       else if (node.IsParentNode) {
+                       } else if (node.IsParentNode) {
                                if (parentNodeStyle != null && parentNodeStyle.NodeSpacing != Unit.Empty)
                                        return parentNodeStyle.NodeSpacing;
                        }
@@ -1753,24 +1684,20 @@ namespace System.Web.UI.WebControls
                                        if (leafNodeStyle != null) {
                                                style.CopyFrom (leafNodeStyle);
                                        }
-                               }
-                               else if (node.IsRootNode) {
+                               } else if (node.IsRootNode) {
                                        if (rootNodeStyle != null) {
                                                style.CopyFrom (rootNodeStyle);
                                        }
-                               }
-                               else if (node.IsParentNode) {
+                               } else if (node.IsParentNode) {
                                        if (parentNodeStyle != null) {
                                                style.CopyFrom (parentNodeStyle);
                                        }
                                }
-                               if (levelStyles != null && levelStyles.Count > level) {
+                               if (levelStyles != null && levelStyles.Count > level)
                                        style.CopyFrom (levelStyles [level]);
-                               }
                                
-                               if (nodeIsSelected) {
+                               if (nodeIsSelected)
                                        style.CopyFrom (selectedNodeStyle);
-                               }
                        }
                        style.AddAttributesToRender (writer);
                }
@@ -1791,14 +1718,12 @@ namespace System.Web.UI.WebControls
                                                style.AddCssClass (leafNodeLinkStyle.CssClass);
                                                style.AddCssClass (leafNodeLinkStyle.RegisteredCssClass);
                                        }
-                               }
-                               else if (node.IsRootNode) {
+                               } else if (node.IsRootNode) {
                                        if (rootNodeStyle != null) {
                                                style.AddCssClass (rootNodeLinkStyle.CssClass);
                                                style.AddCssClass (rootNodeLinkStyle.RegisteredCssClass);
                                        }
-                               }
-                               else if (node.IsParentNode) {
+                               } else if (node.IsParentNode) {
                                        if (parentNodeStyle != null) {
                                                style.AddCssClass (parentNodeLinkStyle.CssClass);
                                                style.AddCssClass (parentNodeLinkStyle.RegisteredCssClass);
@@ -1812,34 +1737,28 @@ namespace System.Web.UI.WebControls
                                        style.AddCssClass (selectedNodeLinkStyle.CssClass);
                                        style.AddCssClass (selectedNodeLinkStyle.RegisteredCssClass);
                                }
-                       }
-                       else {
+                       } else {
                                // styles are not registered
                                style.CopyFrom (ControlLinkStyle);
-                               if (nodeStyle != null) {
+                               if (nodeStyle != null)
                                        style.CopyFrom (nodeLinkStyle);
-                               }
                                if (node.IsLeafNode) {
                                        if (node.IsLeafNode && leafNodeStyle != null) {
                                                style.CopyFrom (leafNodeLinkStyle);
                                        }
-                               }
-                               else if (node.IsRootNode) {
+                               } else if (node.IsRootNode) {
                                        if (node.IsRootNode && rootNodeStyle != null) {
                                                style.CopyFrom (rootNodeLinkStyle);
                                        }
-                               }
-                               else if (node.IsParentNode) {
+                               } else if (node.IsParentNode) {
                                        if (node.IsParentNode && parentNodeStyle != null) {
                                                style.CopyFrom (parentNodeLinkStyle);
                                        }
                                }
-                               if (levelStyles != null && levelStyles.Count > level) {
+                               if (levelStyles != null && levelStyles.Count > level)
                                        style.CopyFrom (levelLinkStyles [level]);
-                               }
-                               if (nodeIsSelected) {
+                               if (nodeIsSelected)
                                        style.CopyFrom (selectedNodeLinkStyle);
-                               }
                                style.AlwaysRenderTextDecoration = true;
                        }
                        style.AddAttributesToRender (writer);
@@ -1850,40 +1769,42 @@ namespace System.Web.UI.WebControls
                        if(node.ToolTip.Length>0)
                                writer.AddAttribute ("title", node.ToolTip);
 
-                       if (node.NavigateUrl != "") {
+                       string navigateUrl = node.NavigateUrl;
+                       if (!String.IsNullOrEmpty (navigateUrl)) {
                                string target = node.Target.Length > 0 ? node.Target : Target;
 #if TARGET_J2EE
-                               string navUrl = ResolveClientUrl (node.NavigateUrl, String.Compare (target, "_blank", StringComparison.InvariantCultureIgnoreCase) != 0);
+                               string navUrl = ResolveClientUrl (navigateUrl, String.Compare (target, "_blank", StringComparison.InvariantCultureIgnoreCase) != 0);
 #else
-                               string navUrl = ResolveClientUrl (node.NavigateUrl);
+                               string navUrl = ResolveClientUrl (navigateUrl);
 #endif
                                writer.AddAttribute ("href", navUrl);
                                if (target.Length > 0)
                                        writer.AddAttribute ("target", target);
                                writer.RenderBeginTag (HtmlTextWriterTag.A);
-                       }
-                       else if (node.SelectAction != TreeNodeSelectAction.None) {
+                       } else if (node.SelectAction != TreeNodeSelectAction.None) {
                                if (node.SelectAction == TreeNodeSelectAction.Expand && clientExpand)
                                        writer.AddAttribute ("href", GetClientExpandEvent (node));
                                else
                                        writer.AddAttribute ("href", GetClientEvent (node, "sel"));
                                writer.RenderBeginTag (HtmlTextWriterTag.A);
-                       }
-                       else
+                       } else
                                writer.RenderBeginTag (HtmlTextWriterTag.Span);
                }
                
-               string GetNodeImageToolTip (bool expand, string txt) {
-                       if (expand)  {
-                               if (ExpandImageToolTip != "")
-                                       return String.Format (ExpandImageToolTip, HttpUtility.HtmlAttributeEncode (txt));
+               string GetNodeImageToolTip (bool expand, string txt)
+               {
+                       if (expand) {
+                               string expandImageToolTip = ExpandImageToolTip;
+                               if (!String.IsNullOrEmpty (expandImageToolTip))
+                                       return String.Format (expandImageToolTip, HttpUtility.HtmlAttributeEncode (txt));
                                else if (txt != null)
                                        return "Expand " + HttpUtility.HtmlAttributeEncode (txt);
                                else
                                        return "Expand {0}";
                        } else {
-                               if (CollapseImageToolTip != "")
-                                       return String.Format (CollapseImageToolTip, HttpUtility.HtmlAttributeEncode (txt));
+                               string collapseImageToolTip = CollapseImageToolTip;
+                               if (!String.IsNullOrEmpty (collapseImageToolTip))
+                                       return String.Format (collapseImageToolTip, HttpUtility.HtmlAttributeEncode (txt));
                                else if (txt != null)
                                        return "Collapse " + HttpUtility.HtmlAttributeEncode (txt);
                                else
@@ -1893,7 +1814,7 @@ namespace System.Web.UI.WebControls
                
                string GetNodeClientId (TreeNode node, string sufix)
                {
-                       return ClientID + "_" + node.Path + (sufix != null ? "_" + sufix : "");
+                       return ClientID + "_" + node.Path + (sufix != null ? "_" + sufix : String.Empty);
                }
                                                        
                string GetNodeImageUrl (string shape, ImageStyle imageStyle)
@@ -1906,26 +1827,21 @@ namespace System.Web.UI.WebControls
                                        if (shape == "plus") {
                                                if (!String.IsNullOrEmpty (imageStyle.Expand))
                                                        return GetNodeIconUrl (imageStyle.Expand);
-                                       }
-                                       else if (shape == "minus") {
+                                       } else if (shape == "minus") {
                                                if (!String.IsNullOrEmpty (imageStyle.Collapse))
                                                        return GetNodeIconUrl (imageStyle.Collapse);
-                                       }
-                                       else if (shape == "noexpand") {
+                                       } else if (shape == "noexpand") {
                                                if (!String.IsNullOrEmpty (imageStyle.NoExpand))
                                                        return GetNodeIconUrl (imageStyle.NoExpand);
                                        }
-                               }
-                               else {
+                               } else {
                                        if (shape == "plus") {
                                                if (!String.IsNullOrEmpty (ExpandImageUrl))
                                                        return ResolveClientUrl (ExpandImageUrl);
-                                       }
-                                       else if (shape == "minus") {
+                                       } else if (shape == "minus") {
                                                if (!String.IsNullOrEmpty (CollapseImageUrl))
                                                        return ResolveClientUrl (CollapseImageUrl);
-                                       }
-                                       else if (shape == "noexpand") {
+                                       } else if (shape == "noexpand") {
                                                if (!String.IsNullOrEmpty (NoExpandImageUrl))
                                                        return ResolveClientUrl (NoExpandImageUrl);
                                        }
@@ -2018,7 +1934,8 @@ namespace System.Web.UI.WebControls
                void SetExpandStates (string[] states)
                {
                        foreach (string id in states) {
-                               if (id == null || id == "") continue;
+                               if (String.IsNullOrEmpty (id))
+                                       continue;
                                TreeNode node = FindNodeByPos (id);
                                if (node != null)
                                        node.Expanded = true;
@@ -2048,5 +1965,4 @@ namespace System.Web.UI.WebControls
                }
        }
 }
-
 #endif