|
From: Lesley v. Z. <ex...@us...> - 2005-01-19 23:05:32
|
Update of /cvsroot/mmclibrary/mmclibrary/MMCLib2/Nodes In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv5321 Modified Files: ResultViewColumn.cs ResultViewItem.cs Log Message: Changed a lot of protected variables that where storage for properties to private Index: ResultViewColumn.cs =================================================================== RCS file: /cvsroot/mmclibrary/mmclibrary/MMCLib2/Nodes/ResultViewColumn.cs,v retrieving revision 1.2 retrieving revision 1.3 diff -C2 -d -r1.2 -r1.3 *** ResultViewColumn.cs 22 Jul 2004 14:07:04 -0000 1.2 --- ResultViewColumn.cs 19 Jan 2005 23:05:14 -0000 1.3 *************** *** 14,31 **** // #region ! /// <summary> ! /// Used to get/set the name of the column ! /// </summary> ! protected String m_columnName; ! ! /// <summary> ! /// Used to get/set the format of the column ! /// </summary> ! protected int m_format; ! ! /// <summary> ! /// Used to get/set the Width of the Column ! /// </summary> ! protected int m_width; #endregion --- 14,20 ---- // #region ! private String _columnName; ! private int _format; ! private int _width; #endregion *************** *** 40,45 **** public String ColumnName { ! get { return m_columnName; } ! set { this.m_columnName = value; } } --- 29,34 ---- public String ColumnName { ! get { return _columnName; } ! set { this._columnName = value; } } *************** *** 49,54 **** public int Format { ! get { return this.m_format; } ! set { this.m_format = value; } } --- 38,43 ---- public int Format { ! get { return this._format; } ! set { this._format = value; } } *************** *** 58,63 **** public int Width { ! get { return this.m_width; } ! set { this.m_width = value; } } #endregion --- 47,52 ---- public int Width { ! get { return this._width; } ! set { this._width = value; } } #endregion *************** *** 71,75 **** /// Simple constructor for a left-aligned auto sized column. /// </summary> ! /// <param name="name"></param> public ResultViewColumn(String name) : this(name, (int)ColumnHeaderFormat.LEFT, (int)MMCLV.AUTO) { --- 60,64 ---- /// Simple constructor for a left-aligned auto sized column. /// </summary> ! /// <param name="name">The name of the column</param> public ResultViewColumn(String name) : this(name, (int)ColumnHeaderFormat.LEFT, (int)MMCLV.AUTO) { *************** *** 84,90 **** public ResultViewColumn(String name, int format, int width) { ! m_columnName = name; ! m_format = format; ! m_width = width; } #endregion --- 73,79 ---- public ResultViewColumn(String name, int format, int width) { ! this.ColumnName = name; ! this.Format = format; ! this.Width = width; } #endregion Index: ResultViewItem.cs =================================================================== RCS file: /cvsroot/mmclibrary/mmclibrary/MMCLib2/Nodes/ResultViewItem.cs,v retrieving revision 1.9 retrieving revision 1.10 diff -C2 -d -r1.9 -r1.10 *** ResultViewItem.cs 7 Nov 2004 14:44:37 -0000 1.9 --- ResultViewItem.cs 19 Jan 2005 23:05:14 -0000 1.10 *************** *** 14,20 **** { - public static readonly System.Type Class = typeof(ResultViewItem); - - /////////////////////////////////////////////////////////////////////// // --- 14,17 ---- *************** *** 22,95 **** // #region - /// <summary> - /// Reference back to the snapin - /// </summary> - protected SnapinBase m_snapin; - - /// <summary> - /// Reference back to the snapin - /// </summary> - protected ReportNode m_node; ! /// <summary> ! /// Reference to the currently selected node ! /// </summary> ! protected bool m_selected; ! ! /// <summary> ! /// The Display name ! /// </summary> ! protected String m_displayName; ! ! /// <summary> ! /// Large Image Index ! /// </summary> ! protected int m_largeImage; ! ! /// <summary> ! /// Small Image Index ! /// </summary> ! protected int m_smallImage; ! ! /// <summary> ! /// ??? ! /// </summary> ! protected int m_dummy1; ! ! /// <summary> ! /// ??? ! /// </summary> ! protected int m_dummy2; ! ! /// <summary> ! /// The item-id as assigned by MMC. ! /// </summary> ! protected uint m_itemID; ! ! /// <summary> ! /// The property sheet for this item. ! /// </summary> ! protected PropertySheet m_propsheet; ! ! /// <summary> ! /// ! /// </summary> ! protected int m_image = -1; ! ! /// <summary> ! /// The details for this list-item. The keys are ResultViewItemColumn references, the values ! /// are the details (as Strings). ! /// </summary> ! protected Hashtable m_details = new Hashtable(); ! ! /// <summary> ! /// All "Task" menu items ! /// </summary> ! protected ArrayList m_tasks = null; ! ! /// <summary> ! /// All "Menu" menu items ! /// </summary> ! protected ArrayList m_menus = null; #endregion --- 19,37 ---- // #region ! private readonly static System.Type _class = typeof(ResultViewItem); ! private SnapinBase _snapin; ! private ReportNode _node; ! private bool _selected; ! private String _displayName; ! private int _largeImage; ! private int _smallImage; ! private int _dummy1; ! private int _dummy2; ! private uint _itemID; ! private PropertySheet _propsheet; ! private Hashtable _details = new Hashtable(); ! private ArrayList _tasks = null; ! private ArrayList _menus = null; #endregion *************** *** 98,101 **** --- 40,52 ---- // Properties // + + /// <summary> + /// + /// </summary> + public static System.Type Class + { + get { return _class; } + } + #region /// <summary> *************** *** 104,108 **** public SnapinBase SnapinBase { ! get { return m_snapin; } } --- 55,59 ---- public SnapinBase SnapinBase { ! get { return _snapin; } } *************** *** 112,125 **** public ReportNode Node { ! get { return m_node; } } /// <summary> ! /// /// </summary> public PropertySheet PropertySheet { ! get { return m_propsheet; } ! set { this.m_propsheet = value; } } --- 63,76 ---- public ReportNode Node { ! get { return _node; } } /// <summary> ! /// Get/set the property sheet for this item. /// </summary> public PropertySheet PropertySheet { ! get { return _propsheet; } ! set { this._propsheet = value; } } *************** *** 129,143 **** public String DisplayName { ! get { return m_displayName; } ! set { m_displayName = value; } } /// <summary> ! /// Get/set the selecteed status of this node /// </summary> public bool Selected { ! get { return m_selected; } ! set { m_selected = value; } } --- 80,94 ---- public String DisplayName { ! get { return _displayName; } ! set { _displayName = value; } } /// <summary> ! /// Get/set the selected status of this node /// </summary> public bool Selected { ! get { return _selected; } ! set { _selected = value; } } *************** *** 147,162 **** public uint ItemID { ! get { return this.m_itemID; } ! set { this.m_itemID = value; } } /// <summary> ! /// The details for this list-item. The keys are ResultViewItemColumn references, the values /// are the details (as Strings). /// </summary> public virtual Hashtable Details { ! get { return this.m_details; } ! set { this.m_details = value; } } --- 98,113 ---- public uint ItemID { ! get { return this._itemID; } ! set { this._itemID = value; } } /// <summary> ! /// Get/set the details for this list-item. The keys are ResultViewItemColumn references, the values /// are the details (as Strings). /// </summary> public virtual Hashtable Details { ! get { return this._details; } ! set { this._details = value; } } *************** *** 166,170 **** public virtual int LargeImage { ! get { return this.m_largeImage; } } --- 117,121 ---- public virtual int LargeImage { ! get { return this._largeImage; } } *************** *** 174,178 **** public virtual int SmallImage { ! get { return this.m_smallImage; } } --- 125,129 ---- public virtual int SmallImage { ! get { return this._smallImage; } } *************** *** 182,187 **** public virtual ArrayList Menus { ! get { return m_menus; } ! set { m_menus = value; } } --- 133,138 ---- public virtual ArrayList Menus { ! get { return _menus; } ! set { _menus = value; } } *************** *** 194,199 **** public virtual ArrayList Tasks { ! get { return m_tasks; } ! set { m_tasks = value;} } #endregion --- 145,150 ---- public virtual ArrayList Tasks { ! get { return _tasks; } ! set { _tasks = value;} } #endregion *************** *** 219,223 **** /// <param name="node">The reportnode-ext</param> /// <param name="displayName">The display name for the item. This is the only guaranteed visible column.</param> ! public ResultViewItem(SnapinBase snapin, ReportNode node, String displayName) : this(snapin, node, displayName, "", "") { } --- 170,175 ---- /// <param name="node">The reportnode-ext</param> /// <param name="displayName">The display name for the item. This is the only guaranteed visible column.</param> ! public ResultViewItem(SnapinBase snapin, ReportNode node, String displayName) : this(snapin, node, displayName, "", "") ! { } *************** *** 232,245 **** public ResultViewItem(SnapinBase snapin, ReportNode node, String displayName, String smallImageName, String largeImageName) { ! m_snapin = snapin; ! m_displayName = displayName; ! m_node = node; ! if(node.ResultPaneImages == null) { node.ResultPaneImages = new ImageList(); } ! m_largeImage = node.ResultPaneImages.Add(largeImageName); ! m_smallImage = node.ResultPaneImages.Add(smallImageName); ! m_dummy1 = node.ResultPaneImages.Add(largeImageName); ! m_dummy2 = node.ResultPaneImages.Add(smallImageName); } #endregion --- 184,198 ---- public ResultViewItem(SnapinBase snapin, ReportNode node, String displayName, String smallImageName, String largeImageName) { ! _snapin = snapin; ! _displayName = displayName; ! _node = node; ! if(node.ResultPaneImages == null) ! { node.ResultPaneImages = new ImageList(); } ! _largeImage = node.ResultPaneImages.Add(largeImageName); ! _smallImage = node.ResultPaneImages.Add(smallImageName); ! _dummy1 = node.ResultPaneImages.Add(largeImageName); ! _dummy2 = node.ResultPaneImages.Add(smallImageName); } #endregion *************** *** 250,254 **** /// <param name="col">The column object</param> /// <param name="detail">The detail-text</param> ! public virtual void AddDetail(ResultViewColumn col, String detail) { this.Details.Add(col, detail); } --- 203,208 ---- /// <param name="col">The column object</param> /// <param name="detail">The detail-text</param> ! public virtual void AddDetail(ResultViewColumn col, String detail) ! { this.Details.Add(col, detail); } *************** *** 257,261 **** /// Remove all details. /// </summary> ! public virtual void ClearDetail() { this.Details.Clear(); } --- 211,216 ---- /// Remove all details. /// </summary> ! public virtual void ClearDetail() ! { this.Details.Clear(); } *************** *** 266,276 **** /// <param name="key">The columnname we are looking for</param> /// <returns>The details for the column</returns> ! public virtual String GetDetail(ResultViewColumn key) { ! return (String)this.m_details[key]; } #region IMMCPropertyPage Members protected ArrayList m_propertypages = new ArrayList(); ! public virtual ArrayList PropertyPages { get { return m_propertypages; } set { m_propertypages = value;} --- 221,233 ---- /// <param name="key">The columnname we are looking for</param> /// <returns>The details for the column</returns> ! public virtual String GetDetail(ResultViewColumn key) ! { ! return (String)this._details[key]; } #region IMMCPropertyPage Members protected ArrayList m_propertypages = new ArrayList(); ! public virtual ArrayList PropertyPages ! { get { return m_propertypages; } set { m_propertypages = value;} *************** *** 284,288 **** /// </summary> /// <remarks>The default implementation does nothing</remarks> ! public virtual void OnSelect() { // Called when this item is selected. We do nothing in the default implementation. } --- 241,246 ---- /// </summary> /// <remarks>The default implementation does nothing</remarks> ! public virtual void OnSelect() ! { // Called when this item is selected. We do nothing in the default implementation. } *************** *** 293,297 **** /// </summary> /// <remarks>The default implementation does nothing</remarks> ! public virtual void OnDeselect() { // Called when this item is selected. We do nothing in the default implementation. } --- 251,256 ---- /// </summary> /// <remarks>The default implementation does nothing</remarks> ! public virtual void OnDeselect() ! { // Called when this item is selected. We do nothing in the default implementation. } |
