Fixed issues

Added missing functions
Cleaned up code

SOURCE/Plugin/DeviceDescription.Designer.cs

@@ -304,7 +304,6 @@ namespace Aml.Editor.Plugin
             this.toolStrip1.Size = new System.Drawing.Size(1750, 27);
             this.toolStrip1.TabIndex = 0;
             this.toolStrip1.Text = "toolStrip1";
-            this.toolStrip1.ItemClicked += new System.Windows.Forms.ToolStripItemClickedEventHandler(this.toolStrip1_ItemClicked);
             // 
             // fileButton
             // 
@@ -497,7 +496,6 @@ namespace Aml.Editor.Plugin
             this.filePathLabel.Name = "filePathLabel";
             this.filePathLabel.Size = new System.Drawing.Size(53, 20);
             this.filePathLabel.Text = "  Vendor:";
-            this.filePathLabel.Click += new System.EventHandler(this.filePathLabel_Click);
             // 
             // deviceNameTextBox
             // 
@@ -579,7 +577,6 @@ namespace Aml.Editor.Plugin
             this.splitContainer1.SplitterDistance = 1333;
             this.splitContainer1.SplitterWidth = 3;
             this.splitContainer1.TabIndex = 2;
-            this.splitContainer1.SplitterMoved += new System.Windows.Forms.SplitterEventHandler(this.splitContainer1_SplitterMoved);
             // 
             // dataTabControl
             // 
@@ -598,8 +595,6 @@ namespace Aml.Editor.Plugin
             this.dataTabControl.SizeMode = System.Windows.Forms.TabSizeMode.Fixed;
             this.dataTabControl.TabIndex = 0;
             this.dataTabControl.DrawItem += new System.Windows.Forms.DrawItemEventHandler(this.dataTabControl_DrawItem);
-            this.dataTabControl.SelectedIndexChanged += new System.EventHandler(this.dataTabControl_SelectedIndexChanged);
-            this.dataTabControl.Click += new System.EventHandler(this.dataTabControl_Click);
             // 
             // genericData
             // 
@@ -624,7 +619,6 @@ namespace Aml.Editor.Plugin
             this.Page1_MainPanel.Name = "Page1_MainPanel";
             this.Page1_MainPanel.Size = new System.Drawing.Size(1325, 809);
             this.Page1_MainPanel.TabIndex = 1;
-            this.Page1_MainPanel.Paint += new System.Windows.Forms.PaintEventHandler(this.panel_FrontPage_Paint);
             // 
             // splitContainer2
             // 
@@ -661,6 +655,8 @@ namespace Aml.Editor.Plugin
             this.genericInformationtreeView.SelectedImageIndex = 0;
             this.genericInformationtreeView.Size = new System.Drawing.Size(1325, 75);
             this.genericInformationtreeView.TabIndex = 6;
+            this.genericInformationtreeView.AfterSelect += new System.Windows.Forms.TreeViewEventHandler(this.genericInformationtreeView_AfterSelect);
+            this.genericInformationtreeView.NodeMouseClick += new System.Windows.Forms.TreeNodeMouseClickEventHandler(this.genericInformationtreeView_NodeMouseClick);
             // 
             // imageList2
             // 
@@ -693,6 +689,7 @@ namespace Aml.Editor.Plugin
             this.genericInformationDataGridView.ScrollBars = System.Windows.Forms.ScrollBars.Vertical;
             this.genericInformationDataGridView.Size = new System.Drawing.Size(1325, 176);
             this.genericInformationDataGridView.TabIndex = 5;
+            this.genericInformationDataGridView.CellClick += new System.Windows.Forms.DataGridViewCellEventHandler(this.genericInformationDataGridView_CellClick);
             this.genericInformationDataGridView.MouseUp += new System.Windows.Forms.MouseEventHandler(this.genericInformationDataGridView_MouseUp);
             // 
             // dataGridViewTextBoxColumn31
@@ -820,6 +817,7 @@ namespace Aml.Editor.Plugin
             this.genericparametersAttrDataGridView.RowTemplate.Resizable = System.Windows.Forms.DataGridViewTriState.False;
             this.genericparametersAttrDataGridView.Size = new System.Drawing.Size(1313, 340);
             this.genericparametersAttrDataGridView.TabIndex = 8;
+            this.genericparametersAttrDataGridView.CellEndEdit += new System.Windows.Forms.DataGridViewCellEventHandler(this.genericParametersAttrDataGridView_CellEndEdit);
             // 
             // dataGridViewTextBoxColumn24
             // 
@@ -1124,7 +1122,6 @@ namespace Aml.Editor.Plugin
             this.electricalInterfacesPanel.Name = "electricalInterfacesPanel";
             this.electricalInterfacesPanel.Size = new System.Drawing.Size(1325, 809);
             this.electricalInterfacesPanel.TabIndex = 0;
-            this.electricalInterfacesPanel.Paint += new System.Windows.Forms.PaintEventHandler(this.electricalInterfacesPanel_Paint);
             // 
             // Page3_BottomPanel
             // 
@@ -1184,8 +1181,6 @@ namespace Aml.Editor.Plugin
             this.elecInterAttDataGridView.RowTemplate.Resizable = System.Windows.Forms.DataGridViewTriState.False;
             this.elecInterAttDataGridView.Size = new System.Drawing.Size(1313, 339);
             this.elecInterAttDataGridView.TabIndex = 8;
-            this.elecInterAttDataGridView.CellClick += new System.Windows.Forms.DataGridViewCellEventHandler(this.elecInterAttDataGridView_CellClick);
-            this.elecInterAttDataGridView.CellContentClick += new System.Windows.Forms.DataGridViewCellEventHandler(this.elecInterAttDataGridView_CellContentClick);
             this.elecInterAttDataGridView.CellEndEdit += new System.Windows.Forms.DataGridViewCellEventHandler(this.elecInterAttDataGridView_CellEndEdit);
             // 
             // dataGridViewTextBoxColumn17
@@ -1630,7 +1625,6 @@ namespace Aml.Editor.Plugin
             this.addPicturesandDocsPanel.Name = "addPicturesandDocsPanel";
             this.addPicturesandDocsPanel.Size = new System.Drawing.Size(1325, 809);
             this.addPicturesandDocsPanel.TabIndex = 0;
-            this.addPicturesandDocsPanel.Paint += new System.Windows.Forms.PaintEventHandler(this.addPicturesAndDocsPanel_Paint);
             // 
             // Page2_BottomPanel
             // 
@@ -1859,7 +1853,6 @@ namespace Aml.Editor.Plugin
             this.selectedFileLocationTxtBx.ReadOnly = true;
             this.selectedFileLocationTxtBx.Size = new System.Drawing.Size(1149, 25);
             this.selectedFileLocationTxtBx.TabIndex = 0;
-            this.selectedFileLocationTxtBx.TextChanged += new System.EventHandler(this.selectedFileLocationTxtBx_TextChanged);
             // 
             // AMLfileLabel
             // 
@@ -1891,7 +1884,6 @@ namespace Aml.Editor.Plugin
             this.selectedFileURLTextBox.Name = "selectedFileURLTextBox";
             this.selectedFileURLTextBox.Size = new System.Drawing.Size(1149, 25);
             this.selectedFileURLTextBox.TabIndex = 1;
-            this.selectedFileURLTextBox.TextChanged += new System.EventHandler(this.selectedFileURLTextBox_TextChanged);
             // 
             // treeViewPanel
             // 
@@ -2319,7 +2311,6 @@ namespace Aml.Editor.Plugin
             this.identificationDataBtn.TabIndex = 0;
             this.identificationDataBtn.Text = "Identification Data";
             this.identificationDataBtn.UseVisualStyleBackColor = true;
-            this.identificationDataBtn.Click += new System.EventHandler(this.IdentificationDataBtn_Click);
             // 
             // toolStripButton7
             // 
@@ -2363,7 +2354,6 @@ namespace Aml.Editor.Plugin
             this.commercialDataBtn.TabIndex = 0;
             this.commercialDataBtn.Text = "Commercial Data";
             this.commercialDataBtn.UseVisualStyleBackColor = true;
-            this.commercialDataBtn.Click += new System.EventHandler(this.CommercialDataBtn_Click);
             // 
             // toolStripButton13
             // 

SOURCE/Plugin/DeviceDescription.cs

@@ -93,7 +93,6 @@ namespace Aml.Editor.Plugin
 
             ShowHideElements();
         }
-
         /// <summary>
         /// This is a constructor of this class with MWControlle rargument. 
         /// </summary>
@@ -459,7 +458,10 @@ namespace Aml.Editor.Plugin
             try
             {
                 TreeNode targetNode = treeViewRoleClassLib.SelectedNode;
-                targetNode.SelectedImageIndex = targetNode.ImageIndex;
+                if (targetNode != null)
+                {
+                    targetNode.SelectedImageIndex = targetNode.ImageIndex;
+                }
             }
             catch (Exception)
             {
@@ -485,68 +487,69 @@ namespace Aml.Editor.Plugin
             {
                 if (e.Button == MouseButtons.Left)
                 {
-
+                    if (targetNode != null)
-                    if (targetNode.Parent != null)
                     {
-
+                        if (targetNode.Parent != null)
-                        searchName = targetNode.Parent.Text + targetNode.Text;
-                        electricalInterfacesHeaderlabel.Text = searchName;
-                        //nameTxtBxElecAttri.Text = searchName;
-                        foreach (var pair in device.DictionaryForExternalInterfacesUnderInterfaceClassInElectricalInterfaces)
                         {
-                            if (pair.Key.ToString() == searchName)
+                            searchName = targetNode.Parent.Text + targetNode.Text;
+                            electricalInterfacesHeaderlabel.Text = searchName;
+                            //nameTxtBxElecAttri.Text = searchName;
+                            foreach (var pair in device.DictionaryForExternalInterfacesUnderInterfaceClassInElectricalInterfaces)
                             {
-                                DataTable AMLDataTable = AutomationMLDataTables.AMLAttributeParameters();
+                                if (pair.Key.ToString() == searchName)
-                                AutomationMLDataTables.CreateDataTableWithColumns(AMLDataTable, elecInterAttDataGridView, pair);
-                            }
-                        }
-                        foreach (var pair in device.DictionaryForExternalInterfacesUnderInterfaceClassInElectricalInterfaces)
-                        {
-                            if (pair.Key.ToString() == searchName)
-                            {
-                                foreach (var valueList in pair.Value)
                                 {
-                                    foreach (var item in valueList)
+                                    DataTable AMLDataTable = AutomationMLDataTables.AMLAttributeParameters();
+                                    AutomationMLDataTables.CreateDataTableWithColumns(AMLDataTable, elecInterAttDataGridView, pair);
+                                }
+                            }
+                            foreach (var pair in device.DictionaryForExternalInterfacesUnderInterfaceClassInElectricalInterfaces)
+                            {
+                                if (pair.Key.ToString() == searchName)
+                                {
+                                    foreach (var valueList in pair.Value)
                                     {
-                                        descriptionTxtBoxElecAttri.Text = item.Description;
+                                        foreach (var item in valueList)
-                                        copyrightTxtBxElecAttri.Text = item.CopyRight;
+                                        {
-                                        RefClassNameTxtBxElecAttri.Text = item.ReferencedClassName;
+                                            descriptionTxtBoxElecAttri.Text = item.Description;
-                                        RefBaseClassPathTxtBxElecAttri.Text = item.RefBaseClassPath;
+                                            copyrightTxtBxElecAttri.Text = item.CopyRight;
-                                        attributepathTxtBxElecAttri.Text = item.AttributePath;
+                                            RefClassNameTxtBxElecAttri.Text = item.ReferencedClassName;
-                                        idTxtBxElecAttri.Text = item.ID;
+                                            RefBaseClassPathTxtBxElecAttri.Text = item.RefBaseClassPath;
+                                            attributepathTxtBxElecAttri.Text = item.AttributePath;
+                                            idTxtBxElecAttri.Text = item.ID;
+                                        }
                                     }
                                 }
                             }
                         }
-                    }
+                        else
-                    else
-                    {
-                        searchName = targetNode.Text;
-                        electricalInterfacesHeaderlabel.Text = searchName;
-                        //nameTxtBxElecAttri.Text = searchName;
-                        foreach (var pair in device.DictionaryForInterfaceClassesInElectricalInterfaces)
                         {
-                            if (pair.Key.ToString() == searchName)
+                            searchName = targetNode.Text;
+                            electricalInterfacesHeaderlabel.Text = searchName;
+                            //nameTxtBxElecAttri.Text = searchName;
+                            foreach (var pair in device.DictionaryForInterfaceClassesInElectricalInterfaces)
                             {
-                                DataTable AMLDataTable = AutomationMLDataTables.AMLAttributeParameters();
+                                if (pair.Key.ToString() == searchName)
-                                AutomationMLDataTables.CreateDataTableWithColumns(AMLDataTable, elecInterAttDataGridView, pair);
-                            }
-                        }
-                        foreach (var pair in device.DictionaryForInterfaceClassesInElectricalInterfaces)
-                        {
-                            if (pair.Key.ToString() == searchName)
-                            {
-
-                                foreach (var valueList in pair.Value)
                                 {
-                                    foreach (var item in valueList)
+                                    DataTable AMLDataTable = AutomationMLDataTables.AMLAttributeParameters();
+                                    AutomationMLDataTables.CreateDataTableWithColumns(AMLDataTable, elecInterAttDataGridView, pair);
+                                }
+                            }
+                            foreach (var pair in device.DictionaryForInterfaceClassesInElectricalInterfaces)
+                            {
+                                if (pair.Key.ToString() == searchName)
+                                {
+
+                                    foreach (var valueList in pair.Value)
                                     {
-                                        descriptionTxtBoxElecAttri.Text = item.Description;
+                                        foreach (var item in valueList)
-                                        copyrightTxtBxElecAttri.Text = item.CopyRight;
+                                        {
-                                        RefClassNameTxtBxElecAttri.Text = item.ReferencedClassName;
+                                            descriptionTxtBoxElecAttri.Text = item.Description;
-                                        RefBaseClassPathTxtBxElecAttri.Text = item.RefBaseClassPath;
+                                            copyrightTxtBxElecAttri.Text = item.CopyRight;
-                                        attributepathTxtBxElecAttri.Text = item.AttributePath;
+                                            RefClassNameTxtBxElecAttri.Text = item.ReferencedClassName;
-                                        idTxtBxElecAttri.Text = item.ID;
+                                            RefBaseClassPathTxtBxElecAttri.Text = item.RefBaseClassPath;
+                                            attributepathTxtBxElecAttri.Text = item.AttributePath;
+                                            idTxtBxElecAttri.Text = item.ID;
+                                        }
                                     }
                                 }
                             }
@@ -562,33 +565,6 @@ namespace Aml.Editor.Plugin
 
         }
 
-
-
-
-        private void fileButton_MouseHover(object sender, EventArgs e)
-        {
-            fileButton.ShowDropDown();
-        }
-
-        private void fileButton_ButtonClick(object sender, EventArgs e)
-        {
-            fileButton.ShowDropDown();
-        }
-
-
-        private void helpButton_ButtonClick(object sender, EventArgs e)
-        {
-            helpButton.ShowDropDown();
-        }
-
-        private void helpButton_MouseHover(object sender, EventArgs e)
-        {
-            helpButton.ShowDropDown();
-        }
-
-
-
-
         private void importIODDFileToolStripMenuItem_Click(object sender, EventArgs e)
         {
             filetype = MWData.MWFileType.IODD;
@@ -603,10 +579,6 @@ namespace Aml.Editor.Plugin
             openFileDialog.ShowDialog();
         }
 
-
-
-
-
         private void automationComponentLibraryv100ToolStripMenuItem_Click(object sender, EventArgs e)
         {
             selectLibrary(Properties.Resources.AutomationComponentLibrary_v1_0_0);
@@ -638,8 +610,6 @@ namespace Aml.Editor.Plugin
         }
 
 
-
-
         private void electricalInterfacesCollectionDataGridView_CellClick(object sender, DataGridViewCellEventArgs e)
         {
             try
@@ -1003,17 +973,6 @@ namespace Aml.Editor.Plugin
             }
         }
 
-
-
-
-        private void electricalInterfacesPanel_Paint(object sender, PaintEventArgs e)
-        {
-
-        }
-
-
-
-
         private void genericInformationDataGridView_MouseUp(object sender, MouseEventArgs e)
         {
 
@@ -1216,12 +1175,6 @@ namespace Aml.Editor.Plugin
             }
         }
 
-        private void genericInformationDataGridView_CellContentClick(object sender, DataGridViewCellEventArgs e)
-        {
-
-        }
-
-
         private void autoloadGenericInformationtreeView(TreeNode node)
         {
             string searchName = "";
@@ -1321,76 +1274,77 @@ namespace Aml.Editor.Plugin
             {
                 if (e.Button == MouseButtons.Left)
                 {
-
+                    if (targetNode != null)
-                    if (targetNode.Parent != null)
                     {
-                        searchName = targetNode.Parent.Text + targetNode.Text;
+                        if (targetNode.Parent != null)
-                        genericDataHeaderLabel.Text = searchName;
-                        foreach (var pair in device.DictionaryForExternalInterfacesUnderRoleClassofComponent)
                         {
-                            if (pair.Key.ToString() == searchName)
+                            searchName = targetNode.Parent.Text + targetNode.Text;
+                            genericDataHeaderLabel.Text = searchName;
+                            foreach (var pair in device.DictionaryForExternalInterfacesUnderRoleClassofComponent)
                             {
-                                DataTable AMLDataTable = AutomationMLDataTables.AMLAttributeParameters();
+                                if (pair.Key.ToString() == searchName)
-                                AutomationMLDataTables.CreateDataTableWithColumns(AMLDataTable, genericparametersAttrDataGridView, pair);
-                            }
-
-                        }
-                        foreach (var pair in device.DictionaryForExternalInterfacesUnderRoleClassofComponent)
-                        {
-                            if (pair.Key.ToString() == searchName)
-                            {
-                                foreach (var valueList in pair.Value)
                                 {
-                                    foreach (var item in valueList)
+                                    DataTable AMLDataTable = AutomationMLDataTables.AMLAttributeParameters();
+                                    AutomationMLDataTables.CreateDataTableWithColumns(AMLDataTable, genericparametersAttrDataGridView, pair);
+                                }
+
+                            }
+                            foreach (var pair in device.DictionaryForExternalInterfacesUnderRoleClassofComponent)
+                            {
+                                if (pair.Key.ToString() == searchName)
+                                {
+                                    foreach (var valueList in pair.Value)
                                     {
-                                        genericDataDescriptionTxtBx.Text = item.Description;
+                                        foreach (var item in valueList)
-                                        genericDataCopyrightTxtBx.Text = item.CopyRight;
+                                        {
-                                        genericDataRefClassNameTxtBx.Text = item.ReferencedClassName;
+                                            genericDataDescriptionTxtBx.Text = item.Description;
-                                        genericDataRefBaseClassPathTxtBx.Text = item.RefBaseClassPath;
+                                            genericDataCopyrightTxtBx.Text = item.CopyRight;
-                                        genericDataAttributePathTxtBx.Text = item.AttributePath;
+                                            genericDataRefClassNameTxtBx.Text = item.ReferencedClassName;
-                                        genericDataIDTxtBx.Text = item.ID;
+                                            genericDataRefBaseClassPathTxtBx.Text = item.RefBaseClassPath;
+                                            genericDataAttributePathTxtBx.Text = item.AttributePath;
+                                            genericDataIDTxtBx.Text = item.ID;
+                                        }
                                     }
                                 }
-                            }
-
-                        }
-                    }
-                    else
-                    {
-
-                        searchName = targetNode.Text;
-                        genericDataHeaderLabel.Text = searchName;
-                        foreach (var pair in device.DictionaryForRoleClassofComponent)
-                        {
-                            if (pair.Key.ToString() == searchName)
-                            {
-                                DataTable AMLDataTable = AutomationMLDataTables.AMLAttributeParameters();
-                                AutomationMLDataTables.CreateDataTableWithColumns(AMLDataTable, genericparametersAttrDataGridView, pair);
 
                             }
-
                         }
-                        foreach (var pair in device.DictionaryForRoleClassofComponent)
+                        else
                         {
-                            if (pair.Key.ToString() == searchName)
-                            {
 
-                                foreach (var valueList in pair.Value)
+                            searchName = targetNode.Text;
+                            genericDataHeaderLabel.Text = searchName;
+                            foreach (var pair in device.DictionaryForRoleClassofComponent)
+                            {
+                                if (pair.Key.ToString() == searchName)
                                 {
-                                    foreach (var item in valueList)
+                                    DataTable AMLDataTable = AutomationMLDataTables.AMLAttributeParameters();
+                                    AutomationMLDataTables.CreateDataTableWithColumns(AMLDataTable, genericparametersAttrDataGridView, pair);
+
+                                }
+
+                            }
+                            foreach (var pair in device.DictionaryForRoleClassofComponent)
+                            {
+                                if (pair.Key.ToString() == searchName)
+                                {
+
+                                    foreach (var valueList in pair.Value)
                                     {
-                                        genericDataDescriptionTxtBx.Text = item.Description;
+                                        foreach (var item in valueList)
-                                        genericDataCopyrightTxtBx.Text = item.CopyRight;
+                                        {
-                                        genericDataRefClassNameTxtBx.Text = item.ReferencedClassName;
+                                            genericDataDescriptionTxtBx.Text = item.Description;
-                                        genericDataRefBaseClassPathTxtBx.Text = item.RefBaseClassPath;
+                                            genericDataCopyrightTxtBx.Text = item.CopyRight;
-                                        genericDataAttributePathTxtBx.Text = item.AttributePath;
+                                            genericDataRefClassNameTxtBx.Text = item.ReferencedClassName;
-                                        genericDataIDTxtBx.Text = item.ID;
+                                            genericDataRefBaseClassPathTxtBx.Text = item.RefBaseClassPath;
+                                            genericDataAttributePathTxtBx.Text = item.AttributePath;
+                                            genericDataIDTxtBx.Text = item.ID;
+                                        }
                                     }
                                 }
                             }
                         }
                     }
-
                 }
             }
             catch (Exception) { }
@@ -1407,9 +1361,6 @@ namespace Aml.Editor.Plugin
             catch (Exception) { }
         }
 
-
-
-
         public void ClearHeaderTabPageValuesofElectricalInterfaces()
         {
             descriptionTxtBoxElecAttri.Text = "";
@@ -1432,9 +1383,6 @@ namespace Aml.Editor.Plugin
             genericDataNameTxtBx.Text = "";
         }
 
-
-
-
         private void deleterowsInelectricalInterfacesDataGridView_Click(object sender, EventArgs e)
         {
             try
@@ -1499,51 +1447,59 @@ namespace Aml.Editor.Plugin
                 {
                     int rowIndex = genericInformationDataGridView.CurrentCell.RowIndex;
                     genericInformationDataGridView.CurrentRow.Selected = true;
-                    string interfaceSerialNumber = genericInformationDataGridView.Rows[rowIndex].Cells[0].Value.ToString();
-                    string interfaceClass = genericInformationDataGridView.Rows[rowIndex].Cells[1].Value.ToString();
 
-                    try
+                    DataGridViewCell dataGridCell0 = genericInformationDataGridView.Rows[rowIndex].Cells[0];
+                    DataGridViewCell dataGridCell1 = genericInformationDataGridView.Rows[rowIndex].Cells[1];
+
+                    if (dataGridCell0.Value != null && dataGridCell1.Value != null)
                     {
-                        if (device.DictionaryForRoleClassofComponent.ContainsKey("(" + interfaceSerialNumber + ")" + interfaceClass))
+                        string interfaceSerialNumber = dataGridCell0.Value.ToString();
+                        string interfaceClass = dataGridCell1.Value.ToString();
+
+
+                        try
                         {
-                            device.DictionaryForRoleClassofComponent.Remove("(" + interfaceSerialNumber + ")" + interfaceClass);
+                            if (device.DictionaryForRoleClassofComponent.ContainsKey("(" + interfaceSerialNumber + ")" + interfaceClass))
+                            {
+                                device.DictionaryForRoleClassofComponent.Remove("(" + interfaceSerialNumber + ")" + interfaceClass);
+
+                            }
+
 
                         }
-
+                        catch (Exception)
-
-                    }
-                    catch (Exception)
-                    {
-
-                        throw;
-                    }
-
-                    foreach (var pair in searchAMLLibraryFile.DictionaryForExternalInterfacesInstancesAttributesOfRoleClassLib)
-                    {
-                        if (pair.Key.Contains(interfaceClass))
                         {
-                            try
-                            {
-                                if (device.DictionaryForExternalInterfacesUnderRoleClassofComponent.ContainsKey("(" + interfaceSerialNumber + ")" + pair.Key.ToString()))
-                                {
-                                    device.DictionaryForExternalInterfacesUnderRoleClassofComponent.Remove("(" + interfaceSerialNumber + ")" + pair.Key.ToString());
 
+                            throw;
+                        }
+
+                        foreach (var pair in searchAMLLibraryFile.DictionaryForExternalInterfacesInstancesAttributesOfRoleClassLib)
+                        {
+                            if (pair.Key.Contains(interfaceClass))
+                            {
+                                try
+                                {
+                                    if (device.DictionaryForExternalInterfacesUnderRoleClassofComponent.ContainsKey("(" + interfaceSerialNumber + ")" + pair.Key.ToString()))
+                                    {
+                                        device.DictionaryForExternalInterfacesUnderRoleClassofComponent.Remove("(" + interfaceSerialNumber + ")" + pair.Key.ToString());
+
+                                    }
+
+                                }
+                                catch (Exception)
+                                {
+
+                                    throw;
                                 }
 
                             }
-                            catch (Exception)
-                            {
-
-                                throw;
-                            }
-
                         }
+
+                        genericInformationDataGridView.Rows.RemoveAt(rowIndex);
+
                     }
 
-                    genericInformationDataGridView.Rows.RemoveAt(rowIndex);
-
                 }
-
             }
             catch (Exception) { }
         }
@@ -3295,15 +3251,6 @@ namespace Aml.Editor.Plugin
             }
         }
 
-
-
-
-
-        private void dataTabControl_Click(object sender, EventArgs e)
-        {
-
-        }
-
         private void dataTabControl_DrawItem(object sender, DrawItemEventArgs e)
         {
             try
@@ -3365,9 +3312,6 @@ namespace Aml.Editor.Plugin
             }
         }
 
-
-
-
         private void automationMLRoleCmbBx_SelectedIndexChanged(object sender, EventArgs e)
         {
 
@@ -3409,50 +3353,52 @@ namespace Aml.Editor.Plugin
                 {
                     try
                     {
-                        if (eachrow.Cells[0].Value.Equals(searchValue))
+                        if (eachrow.Cells[0].Value != null)
                         {
-
+                            if (eachrow.Cells[0].Value.Equals(searchValue))
-                            foreach (DataGridViewRow eachrow3 in attachablesInfoDataGridView.Rows)
                             {
-                                try
+
+                                foreach (DataGridViewRow eachrow3 in attachablesInfoDataGridView.Rows)
                                 {
-                                    if (eachrow3.Cells[0].Value != null &&
+                                    try
-                                        eachrow3.Cells[0].Value.ToString().Contains(searchValue))
                                     {
-                                        string eachstringindataGridView = eachrow3.Cells[0].Value.ToString();
+                                        if (eachrow3.Cells[0].Value != null &&
-                                        listofstrings.Add(eachstringindataGridView);
+                                            eachrow3.Cells[0].Value.ToString().Contains(searchValue))
+                                        {
+                                            string eachstringindataGridView = eachrow3.Cells[0].Value.ToString();
+                                            listofstrings.Add(eachstringindataGridView);
+                                        }
+
+                                    }
+                                    catch (Exception)
+                                    {
+                                        throw;
+                                    }
+                                }
+
+                                foreach (string eachstring in listofstrings)
+                                {
+                                    bool success =
+                                        int.TryParse(
+                                            new string(eachstring.SkipWhile(x => !char.IsDigit(x))
+                                                .TakeWhile(x => char.IsDigit(x)).ToArray()), out i);
+                                    if (success == false)
+                                    {
+                                        i = 0;
                                     }
 
+                                    listofintegers.Add(i);
                                 }
-                                catch (Exception)
+
-                                {
+                                result3 = listofintegers.Max();
-                                    throw;
+
-                                }
+                                ultrafinal = searchValue + mid + Convert.ToString(++result3);
+
+                                AMLfileLabel.Text = ultrafinal;
+                                AMLURLLabel.Text = ultrafinal;
+
                             }
-
-                            foreach (string eachstring in listofstrings)
-                            {
-                                bool success =
-                                    int.TryParse(
-                                        new string(eachstring.SkipWhile(x => !char.IsDigit(x))
-                                            .TakeWhile(x => char.IsDigit(x)).ToArray()), out i);
-                                if (success == false)
-                                {
-                                    i = 0;
-                                }
-
-                                listofintegers.Add(i);
-                            }
-
-                            result3 = listofintegers.Max();
-
-                            ultrafinal = searchValue + mid + Convert.ToString(++result3);
-
-                            AMLfileLabel.Text = ultrafinal;
-                            AMLURLLabel.Text = ultrafinal;
-
                         }
-
                     }
                     catch (Exception)
                     {
@@ -3468,10 +3414,6 @@ namespace Aml.Editor.Plugin
             }
         }
 
-
-
-
-
         private void addRole_Click(object sender, EventArgs e)
         {
 
@@ -3510,41 +3452,44 @@ namespace Aml.Editor.Plugin
                 {
                     try
                     {
-                        if (eachrow.Cells[0].Value.Equals(searchValue))
+                        if (eachrow.Cells[0].Value != null)
                         {
-
+                            if (eachrow.Cells[0].Value.Equals(searchValue))
-                            foreach (DataGridViewRow eachrow3 in attachablesInfoDataGridView.Rows)
                             {
-                                try
+
+                                foreach (DataGridViewRow eachrow3 in attachablesInfoDataGridView.Rows)
                                 {
-                                    if (eachrow3.Cells[0].Value != null && eachrow3.Cells[0].Value.ToString().Contains(searchValue))
+                                    try
                                     {
-                                        string eachstringindataGridView = eachrow3.Cells[0].Value.ToString();
+                                        if (eachrow3.Cells[0].Value != null && eachrow3.Cells[0].Value.ToString().Contains(searchValue))
-                                        listofstrings.Add(eachstringindataGridView);
+                                        {
+                                            string eachstringindataGridView = eachrow3.Cells[0].Value.ToString();
+                                            listofstrings.Add(eachstringindataGridView);
+                                        }
+
+                                    }
+                                    catch (Exception)
+                                    {
+                                        throw;
                                     }
-
                                 }
-                                catch (Exception)
+                                foreach (string eachstring in listofstrings)
                                 {
-                                    throw;
+                                    bool success = int.TryParse(new string(eachstring.SkipWhile(x => !char.IsDigit(x)).TakeWhile(x => char.IsDigit(x)).ToArray()), out i);
+                                    if (success == false)
+                                    {
+                                        i = 0;
+                                    }
+                                    listofintegers.Add(i);
                                 }
+
+                                result3 = listofintegers.Max();
+
+                                ultrafinal = searchValue + mid + Convert.ToString(++result3);
+
+                                AMLfileLabel.Text = ultrafinal;
+                                AMLURLLabel.Text = ultrafinal;
                             }
-                            foreach (string eachstring in listofstrings)
-                            {
-                                bool success = int.TryParse(new string(eachstring.SkipWhile(x => !char.IsDigit(x)).TakeWhile(x => char.IsDigit(x)).ToArray()), out i);
-                                if (success == false)
-                                {
-                                    i = 0;
-                                }
-                                listofintegers.Add(i);
-                            }
-
-                            result3 = listofintegers.Max();
-
-                            ultrafinal = searchValue + mid + Convert.ToString(++result3);
-
-                            AMLfileLabel.Text = ultrafinal;
-                            AMLURLLabel.Text = ultrafinal;
                         }
                     }
                     catch (Exception) { }
@@ -3602,19 +3547,6 @@ namespace Aml.Editor.Plugin
             }
         }
 
-        private void selectedFileLocationTxtBx_TextChanged(object sender, EventArgs e)
-        {
-
-        }
-
-        private void selectedFileURLTextBox_TextChanged(object sender, EventArgs e)
-        {
-
-        }
-
-
-
-
         public void clear()
         {
             vendorNameTextBox.Text = "";
@@ -3880,14 +3812,6 @@ namespace Aml.Editor.Plugin
             }
         }
 
-
-
-
-        private void elecInterAttDataGridView_CellClick(object sender, DataGridViewCellEventArgs e)
-        {
-
-        }
-
         private void elecInterAttDataGridView_CellEndEdit(object sender, DataGridViewCellEventArgs e)
         {
             ClearHeaderTabPageValuesofElectricalInterfaces();
@@ -4103,14 +4027,6 @@ namespace Aml.Editor.Plugin
             elecInterAttDataGridView.CurrentRow.Selected = false;
         }
 
-        private void elecInterAttDataGridView_CellContentClick(object sender, DataGridViewCellEventArgs e)
-        {
-
-        }
-
-
-
-
         private void vendorNameTextBox_Leave(object sender, EventArgs e)
         {
             foreach (var pair in device.DictionaryForRoleClassofComponent)
@@ -4177,19 +4093,6 @@ namespace Aml.Editor.Plugin
             }
         }
 
-
-
-
-        private void IdentificationDataBtn_Click(object sender, EventArgs e)
-        {
-
-        }
-
-        private void CommercialDataBtn_Click(object sender, EventArgs e)
-        {
-
-        }
-
         private void clearSelectedRowBtn_Click(object sender, EventArgs e)
         {
             try
@@ -4203,16 +4106,6 @@ namespace Aml.Editor.Plugin
             catch (Exception) { }
         }
 
-
-
-
-
-
-        private void genericParametersAttrDataGridView_CellClick(object sender, DataGridViewCellEventArgs e)
-        {
-
-        }
-
         private void genericParametersAttrDataGridView_CellEndEdit(object sender, DataGridViewCellEventArgs e)
         {
             ClearHeaderTabPageValuesofgenericData();
@@ -4428,129 +4321,11 @@ namespace Aml.Editor.Plugin
             genericparametersAttrDataGridView.CurrentRow.Selected = false;
         }
 
-        private void genericParametersAttrDataGridView_CellContentClick(object sender, DataGridViewCellEventArgs e)
-        {
-
-        }
-
-
-
-
-        private void panel_FrontPage_Paint(object sender, PaintEventArgs e)
-        {
-
-        }
-
-        private void Page1_TopPanel_Paint(object sender, PaintEventArgs e)
-        {
-
-        }
-
-        private void addPicturesAndDocsPanel_Paint(object sender, PaintEventArgs e)
-        {
-
-        }
-
-
-
-
-        private void splitContainer1_SplitterMoved(object sender, SplitterEventArgs e)
-        {
-
-        }
-
-
-
-        /// <summary>
-        /// Methodes not even used one time
-        /// </summary>
-
-        private void treeViewElectricalInterfaces_AfterSelect(object sender, TreeViewEventArgs e)
-        {
-            try
-            {
-                TreeNode targetNode = treeViewElectricalInterfaces.SelectedNode;
-
-                targetNode.SelectedImageIndex = targetNode.ImageIndex;
-            }
-            catch (Exception) { }
-
-        }
-
-        private void treeViewElectricalInterfaces_Click(object sender, EventArgs e)
-        {
-            try
-            {
-                TreeNode targetNode = treeViewRoleClassLib.SelectedNode;
-                targetNode.SelectedImageIndex = targetNode.ImageIndex;
-            }
-            catch (Exception) { }
-        }
-
-        private void librariesSplitButton_DoubleClick(object sender, EventArgs e)
-        {
-            OpenFileDialog op = new OpenFileDialog();
-            if (op.ShowDialog() == DialogResult.OK)
-            {
-
-            }
-        }
-
-        private void librariesSplitButton_MouseHover(object sender, EventArgs e)
-        {
-            librariesSplitButton.ShowDropDown();
-        }
-
-        private void librariesSplitButton_ButtonClick(object sender, EventArgs e)
-        {
-            librariesSplitButton.ShowDropDown();
-        }
-
-
-
-
-        private void treeViewImportedInterfaceHierarchy_MouseClick(object sender, MouseEventArgs e)
-        {
-
-        }
-
-        private void treeViewImportedInterfaceHierarchy_MouseDown(object sender, MouseEventArgs e)
-        {
-            // this.treeViewImportedInterfaceHierarchy.MouseDown += new MouseEventHandler(this.tree_MouseDown);
-
-        }
-
-        private void treeViewImportedInterfaceHierarchy_DragOver(object sender, DragEventArgs e)
-        {
-            // this.treeViewImportedInterfaceHierarchy.DragOver += new DragEventHandler(this.tree_DragOver);
-        }
-
-        private void treeViewImportedInterfaceHierarchy_DragDrop(object sender, DragEventArgs e)
-        {
-            //this.treeViewImportedInterfaceHierarchy.DragDrop += new DragEventHandler(this.tree_DragDrop);
-        }
-
-
-
-
-        private void ClearDeviceDataBtn_Click(object sender, EventArgs e)
-        {
-            vendorNameTextBox.Text = "";
-
-            deviceNameTextBox.Text = "";
-
-        }
-
         private void electricalInterfacesCollectionDataGridView_CellContentClick(object sender, DataGridViewCellEventArgs e)
         {
             return;
         }
 
-        private void dataTabControl_SelectedIndexChanged(object sender, EventArgs e)
-        {
-
-        }
-
         private void vendorNameTextBox_TextChanged(object sender, EventArgs e)
         {
             vendorNameTextBox_Leave(sender, e);
@@ -4705,16 +4480,6 @@ namespace Aml.Editor.Plugin
             }
         }
 
-        private void toolStrip1_ItemClicked(object sender, ToolStripItemClickedEventArgs e)
-        {
-
-        }
-
-        private void filePathLabel_Click(object sender, EventArgs e)
-        {
-
-        }
-
         private void advancedModeToolStripMenuItem_Click(object sender, EventArgs e)
         {
             // Switch mode

SOURCE/Plugin/DeviceDescription.resx

@@ -123,12 +123,6 @@
   <metadata name="toolTip1.TrayLocation" type="System.Drawing.Point, System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a">
     <value>265, 17</value>
   </metadata>
-  <metadata name="toolStrip2.TrayLocation" type="System.Drawing.Point, System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a">
-    <value>1330, 103</value>
-  </metadata>
-  <metadata name="toolStrip24.TrayLocation" type="System.Drawing.Point, System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a">
-    <value>1066, 103</value>
-  </metadata>
   <metadata name="imageList2.TrayLocation" type="System.Drawing.Point, System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a">
     <value>278, 103</value>
   </metadata>
@@ -137,7 +131,7 @@
         AAEAAAD/////AQAAAAAAAAAMAgAAAFdTeXN0ZW0uV2luZG93cy5Gb3JtcywgVmVyc2lvbj00LjAuMC4w
         LCBDdWx0dXJlPW5ldXRyYWwsIFB1YmxpY0tleVRva2VuPWI3N2E1YzU2MTkzNGUwODkFAQAAACZTeXN0
         ZW0uV2luZG93cy5Gb3Jtcy5JbWFnZUxpc3RTdHJlYW1lcgEAAAAERGF0YQcCAgAAAAkDAAAADwMAAAD6
-        DAAAAk1TRnQBSQFMAgEBAwEAAUABBAFAAQQBHAEAARwBAAT/AQkBAAj/AUIBTQE2AQQGAAE2AQQCAAEo
+        DAAAAk1TRnQBSQFMAgEBAwEAAVABBAFQAQQBHAEAARwBAAT/AQkBAAj/AUIBTQE2AQQGAAE2AQQCAAEo
         AwABcAMAARwDAAEBAQABCAUAAUABDBgAAYACAAGAAwACgAEAAYADAAGAAQABgAEAAoACAAPAAQABwAHc
         AcABAAHwAcoBpgEAATMFAAEzAQABMwEAATMBAAIzAgADFgEAAxwBAAMiAQADKQEAA1UBAANNAQADQgEA
         AzkBAAGAAXwB/wEAAlAB/wEAAZMBAAHWAQAB/wHsAcwBAAHGAdYB7wEAAdYC5wEAAZABqQGtAgAB/wEz
@@ -213,24 +207,6 @@
   <metadata name="deleteRoleClassesButton.TrayLocation" type="System.Drawing.Point, System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a">
     <value>853, 146</value>
   </metadata>
-  <metadata name="toolStrip5.TrayLocation" type="System.Drawing.Point, System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a">
-    <value>1038, 146</value>
-  </metadata>
-  <metadata name="dataGridViewTextBoxColumn31.UserAddedColumn" type="System.Boolean, mscorlib, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089">
-    <value>True</value>
-  </metadata>
-  <metadata name="dataGridViewTextBoxColumn32.UserAddedColumn" type="System.Boolean, mscorlib, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089">
-    <value>True</value>
-  </metadata>
-  <metadata name="loadfromLibrary.UserAddedColumn" type="System.Boolean, mscorlib, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089">
-    <value>True</value>
-  </metadata>
-  <metadata name="loadFromComponentFile.UserAddedColumn" type="System.Boolean, mscorlib, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089">
-    <value>True</value>
-  </metadata>
-  <metadata name="dataGridViewCheckBoxColumn2.UserAddedColumn" type="System.Boolean, mscorlib, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089">
-    <value>True</value>
-  </metadata>
   <assembly alias="System.Drawing" name="System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a" />
   <data name="deleteRoleClassButton.Image" type="System.Drawing.Bitmap, System.Drawing" mimetype="application/x-microsoft.net.object.bytearray.base64">
     <value>
@@ -265,23 +241,8 @@
   <metadata name="dataGridViewTextBoxColumn29.UserAddedColumn" type="System.Boolean, mscorlib, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089">
     <value>True</value>
   </metadata>
-  <metadata name="dataGridViewTextBoxColumn24.UserAddedColumn" type="System.Boolean, mscorlib, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089">
+  <metadata name="toolStrip5.TrayLocation" type="System.Drawing.Point, System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a">
-    <value>True</value>
+    <value>1038, 146</value>
-  </metadata>
-  <metadata name="dataGridViewTextBoxColumn25.UserAddedColumn" type="System.Boolean, mscorlib, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089">
-    <value>True</value>
-  </metadata>
-  <metadata name="dataGridViewTextBoxColumn26.UserAddedColumn" type="System.Boolean, mscorlib, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089">
-    <value>True</value>
-  </metadata>
-  <metadata name="dataGridViewTextBoxColumn27.UserAddedColumn" type="System.Boolean, mscorlib, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089">
-    <value>True</value>
-  </metadata>
-  <metadata name="dataGridViewTextBoxColumn28.UserAddedColumn" type="System.Boolean, mscorlib, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089">
-    <value>True</value>
-  </metadata>
-  <metadata name="dataGridViewTextBoxColumn29.UserAddedColumn" type="System.Boolean, mscorlib, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089">
-    <value>True</value>
   </metadata>
   <metadata name="dataGridViewTextBoxColumn17.UserAddedColumn" type="System.Boolean, mscorlib, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089">
     <value>True</value>
@@ -301,38 +262,8 @@
   <metadata name="dataGridViewTextBoxColumn22.UserAddedColumn" type="System.Boolean, mscorlib, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089">
     <value>True</value>
   </metadata>
-  <metadata name="dataGridViewTextBoxColumn17.UserAddedColumn" type="System.Boolean, mscorlib, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089">
+  <metadata name="toolStrip2.TrayLocation" type="System.Drawing.Point, System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a">
-    <value>True</value>
+    <value>1330, 103</value>
-  </metadata>
-  <metadata name="dataGridViewTextBoxColumn18.UserAddedColumn" type="System.Boolean, mscorlib, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089">
-    <value>True</value>
-  </metadata>
-  <metadata name="dataGridViewTextBoxColumn19.UserAddedColumn" type="System.Boolean, mscorlib, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089">
-    <value>True</value>
-  </metadata>
-  <metadata name="dataGridViewTextBoxColumn20.UserAddedColumn" type="System.Boolean, mscorlib, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089">
-    <value>True</value>
-  </metadata>
-  <metadata name="dataGridViewTextBoxColumn21.UserAddedColumn" type="System.Boolean, mscorlib, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089">
-    <value>True</value>
-  </metadata>
-  <metadata name="dataGridViewTextBoxColumn22.UserAddedColumn" type="System.Boolean, mscorlib, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089">
-    <value>True</value>
-  </metadata>
-  <metadata name="SerialNumber.UserAddedColumn" type="System.Boolean, mscorlib, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089">
-    <value>True</value>
-  </metadata>
-  <metadata name="SelectedClassorInterface.UserAddedColumn" type="System.Boolean, mscorlib, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089">
-    <value>True</value>
-  </metadata>
-  <metadata name="libraryFile.UserAddedColumn" type="System.Boolean, mscorlib, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089">
-    <value>True</value>
-  </metadata>
-  <metadata name="componentFile.UserAddedColumn" type="System.Boolean, mscorlib, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089">
-    <value>True</value>
-  </metadata>
-  <metadata name="dataGridViewCheckBoxColumn1.UserAddedColumn" type="System.Boolean, mscorlib, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089">
-    <value>True</value>
   </metadata>
   <metadata name="SerialNumber.UserAddedColumn" type="System.Boolean, mscorlib, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089">
     <value>True</value>
@@ -367,18 +298,6 @@
         TgDQASA1MVpwzwAAAABJRU5ErkJggg==
 </value>
   </data>
-  <metadata name="toolStrip19.TrayLocation" type="System.Drawing.Point, System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a">
-    <value>1179, 60</value>
-  </metadata>
-  <metadata name="ElementName.UserAddedColumn" type="System.Boolean, mscorlib, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089">
-    <value>True</value>
-  </metadata>
-  <metadata name="FilePath.UserAddedColumn" type="System.Boolean, mscorlib, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089">
-    <value>True</value>
-  </metadata>
-  <metadata name="Add.UserAddedColumn" type="System.Boolean, mscorlib, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089">
-    <value>True</value>
-  </metadata>
   <metadata name="ElementName.UserAddedColumn" type="System.Boolean, mscorlib, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089">
     <value>True</value>
   </metadata>
@@ -409,9 +328,6 @@
   <metadata name="toolStrip13.TrayLocation" type="System.Drawing.Point, System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a">
     <value>729, 60</value>
   </metadata>
-  <metadata name="toolStrip13.TrayLocation" type="System.Drawing.Point, System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a">
-    <value>729, 60</value>
-  </metadata>
   <data name="addRole.Image" type="System.Drawing.Bitmap, System.Drawing" mimetype="application/x-microsoft.net.object.bytearray.base64">
     <value>
         iVBORw0KGgoAAAANSUhEUgAAAB4AAAAeCAYAAAA7MK6iAAAAAXNSR0IArs4c6QAAAARnQU1BAACxjwv8
@@ -420,12 +336,6 @@
         RgtnViTyCJEC4UCoEdfIj94AAAAASUVORK5CYII=
 </value>
   </data>
-  <metadata name="toolStrip7.TrayLocation" type="System.Drawing.Point, System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a">
-    <value>1311, 60</value>
-  </metadata>
-  <metadata name="toolStrip9.TrayLocation" type="System.Drawing.Point, System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a">
-    <value>1435, 60</value>
-  </metadata>
   <metadata name="imageList1.TrayLocation" type="System.Drawing.Point, System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a">
     <value>149, 103</value>
   </metadata>
@@ -434,7 +344,7 @@
         AAEAAAD/////AQAAAAAAAAAMAgAAAFdTeXN0ZW0uV2luZG93cy5Gb3JtcywgVmVyc2lvbj00LjAuMC4w
         LCBDdWx0dXJlPW5ldXRyYWwsIFB1YmxpY0tleVRva2VuPWI3N2E1YzU2MTkzNGUwODkFAQAAACZTeXN0
         ZW0uV2luZG93cy5Gb3Jtcy5JbWFnZUxpc3RTdHJlYW1lcgEAAAAERGF0YQcCAgAAAAkDAAAADwMAAABC
-        DQAAAk1TRnQBSQFMAgEBAwEAAUABBAFAAQQBHAEAARwBAAT/AQkBAAj/AUIBTQE2AQQGAAE2AQQCAAEo
+        DQAAAk1TRnQBSQFMAgEBAwEAAVABBAFQAQQBHAEAARwBAAT/AQkBAAj/AUIBTQE2AQQGAAE2AQQCAAEo
         AwABcAMAARwDAAEBAQABCAUAAUABDBgAAYACAAGAAwACgAEAAYADAAGAAQABgAEAAoACAAPAAQABwAHc
         AcABAAHwAcoBpgEAATMFAAEzAQABMwEAATMBAAIzAgADFgEAAxwBAAMiAQADKQEAA1UBAANNAQADQgEA
         AzkBAAGAAXwB/wEAAlAB/wEAAZMBAAHWAQAB/wHsAcwBAAHGAdYB7wEAAdYC5wEAAZABqQGtAgAB/wEz
@@ -507,7 +417,7 @@
         AAEAAAD/////AQAAAAAAAAAMAgAAAFdTeXN0ZW0uV2luZG93cy5Gb3JtcywgVmVyc2lvbj00LjAuMC4w
         LCBDdWx0dXJlPW5ldXRyYWwsIFB1YmxpY0tleVRva2VuPWI3N2E1YzU2MTkzNGUwODkFAQAAACZTeXN0
         ZW0uV2luZG93cy5Gb3Jtcy5JbWFnZUxpc3RTdHJlYW1lcgEAAAAERGF0YQcCAgAAAAkDAAAADwMAAAC4
-        CQAAAk1TRnQBSQFMAgEBAgEAATgBBAE4AQQBGQEAARkBAAT/AQkBAAj/AUIBTQE2AQQGAAE2AQQCAAEo
+        CQAAAk1TRnQBSQFMAgEBAgEAAUgBBAFIAQQBGQEAARkBAAT/AQkBAAj/AUIBTQE2AQQGAAE2AQQCAAEo
         AwABZAMAARkDAAEBAQABCAUAAcQBCRgAAYACAAGAAwACgAEAAYADAAGAAQABgAEAAoACAAPAAQABwAHc
         AcABAAHwAcoBpgEAATMFAAEzAQABMwEAATMBAAIzAgADFgEAAxwBAAMiAQADKQEAA1UBAANNAQADQgEA
         AzkBAAGAAXwB/wEAAlAB/wEAAZMBAAHWAQAB/wHsAcwBAAHGAdYB7wEAAdYC5wEAAZABqQGtAgAB/wEz
@@ -562,7 +472,7 @@
         AAEAAAD/////AQAAAAAAAAAMAgAAAFdTeXN0ZW0uV2luZG93cy5Gb3JtcywgVmVyc2lvbj00LjAuMC4w
         LCBDdWx0dXJlPW5ldXRyYWwsIFB1YmxpY0tleVRva2VuPWI3N2E1YzU2MTkzNGUwODkFAQAAACZTeXN0
         ZW0uV2luZG93cy5Gb3Jtcy5JbWFnZUxpc3RTdHJlYW1lcgEAAAAERGF0YQcCAgAAAAkDAAAADwMAAAAA
-        CAAAAk1TRnQBSQFMAwEBAAFAAQQBQAEEARABAAEQAQAE/wEJAQAI/wFCAU0BNgEEBgABNgEEAgABKAMA
+        CAAAAk1TRnQBSQFMAwEBAAFQAQQBUAEEARABAAEQAQAE/wEJAQAI/wFCAU0BNgEEBgABNgEEAgABKAMA
         AUADAAEQAwABAQEAAQgGAAEEGAABgAIAAYADAAKAAQABgAMAAYABAAGAAQACgAIAA8ABAAHAAdwBwAEA
         AfABygGmAQABMwUAATMBAAEzAQABMwEAAjMCAAMWAQADHAEAAyIBAAMpAQADVQEAA00BAANCAQADOQEA
         AYABfAH/AQACUAH/AQABkwEAAdYBAAH/AewBzAEAAcYB1gHvAQAB1gLnAQABkAGpAa0CAAH/ATMDAAFm