Cleaned up code

This commit is contained in:
Administrator 2022-04-07 08:37:54 +02:00
parent 39c0720683
commit 1251cb5a72
16 changed files with 230 additions and 282 deletions

View File

@ -1,11 +1,4 @@
using System; using System;
using System.Collections.Generic;
using System.ComponentModel;
using System.Data;
using System.Drawing;
using System.Linq;
using System.Text;
using System.Threading.Tasks;
using System.Windows.Forms; using System.Windows.Forms;
namespace App namespace App

View File

@ -1,7 +1,4 @@
using System; using System;
using System.Collections.Generic;
using System.Linq;
using System.Threading.Tasks;
using System.Windows.Forms; using System.Windows.Forms;
namespace App namespace App

View File

@ -1,5 +1,4 @@
using System.Reflection; using System.Reflection;
using System.Runtime.CompilerServices;
using System.Runtime.InteropServices; using System.Runtime.InteropServices;
// Allgemeine Informationen über eine Assembly werden über die folgenden // Allgemeine Informationen über eine Assembly werden über die folgenden

View File

@ -1,7 +1,6 @@
 
using System.Reflection; using System.Reflection;
using System.Windows; using System.Windows;
using System.Windows.Controls;
using System.Windows.Navigation; using System.Windows.Navigation;
namespace Aml.Editor.Plugin namespace Aml.Editor.Plugin
@ -18,7 +17,7 @@ namespace Aml.Editor.Plugin
var assembly = Assembly.GetCallingAssembly(); var assembly = Assembly.GetCallingAssembly();
txtVersion.Text = "Version "+ assembly.GetName().Version.ToString(); txtVersion.Text = "Version " + assembly.GetName().Version.ToString();
} }

View File

@ -1,14 +1,8 @@
using System; using Aml.Editor.Plugin.Properties;
using System.Collections.Generic; using System;
using System.Linq;
using System.Text;
using System.Threading.Tasks;
using System.Windows.Forms;
using Aml.Editor.Plugin.Properties;
using System.IO;
using System.Drawing; using System.Drawing;
using System.Web; using System.IO;
using System.Net; using System.Windows.Forms;
namespace Aml.Editor.Plugin namespace Aml.Editor.Plugin
{ {
@ -22,7 +16,7 @@ namespace Aml.Editor.Plugin
public Button DisplayBtn { get; set; } public Button DisplayBtn { get; set; }
public DataGridView dataGridView { get; set; } public DataGridView dataGridView { get; set; }
public string words { get; set; } public string words { get; set; }
// public TreeNode Node { get; set; } // public TreeNode Node { get; set; }
public AnimationClass() public AnimationClass()
@ -31,7 +25,7 @@ namespace Aml.Editor.Plugin
} }
// Method for window size maximum and minimum // Method for window size maximum and minimum
public void WindowSizeChanger(Panel panelNumber,Button buttonNumber) public void WindowSizeChanger(Panel panelNumber, Button buttonNumber)
{ {
PanelNumber = panelNumber; PanelNumber = panelNumber;
ButtonNumber = buttonNumber; ButtonNumber = buttonNumber;
@ -50,7 +44,7 @@ namespace Aml.Editor.Plugin
public void WindowSizeChanger(Panel panelNumber) public void WindowSizeChanger(Panel panelNumber)
{ {
PanelNumber = panelNumber; PanelNumber = panelNumber;
// Node = node; // Node = node;
if (panelNumber.Size == panelNumber.MaximumSize) if (panelNumber.Size == panelNumber.MaximumSize)
{ {
panelNumber.Size = panelNumber.MinimumSize; panelNumber.Size = panelNumber.MinimumSize;
@ -93,20 +87,20 @@ namespace Aml.Editor.Plugin
} }
} }
// method for opening IEC-CDD urls // method for opening IEC-CDD urls
public void ManualOpener(string btnText) public void ManualOpener(string btnText)
{ {
string mainUrl = "https://cdd.iec.ch/CDD/IEC62683/iec62683.nsf/PropertiesAllVersions/0112-2---62683%23"; string mainUrl = "https://cdd.iec.ch/CDD/IEC62683/iec62683.nsf/PropertiesAllVersions/0112-2---62683%23";
string lastUrl = "?OpenDocument"; string lastUrl = "?OpenDocument";
string midUrl = btnText.Substring(15); string midUrl = btnText.Substring(15);
string finalUrl = mainUrl +midUrl+ lastUrl; string finalUrl = mainUrl + midUrl + lastUrl;
System.Diagnostics.Process.Start(finalUrl); System.Diagnostics.Process.Start(finalUrl);
} }
// Open Dialog Box related method that takes parmeters of textbox name and the picture box number. // Open Dialog Box related method that takes parmeters of textbox name and the picture box number.
public void OpenFileDialog(TextBox textboxName,PictureBox pictureBoxNumber) public void OpenFileDialog(TextBox textboxName, PictureBox pictureBoxNumber)
{ {
TextboxName = textboxName; TextboxName = textboxName;
PictureboxNumber = pictureBoxNumber; PictureboxNumber = pictureBoxNumber;
@ -136,7 +130,7 @@ namespace Aml.Editor.Plugin
} }
// this method dispaly all hidden buttons with the Refsemantic Id in them. // this method dispaly all hidden buttons with the Refsemantic Id in them.
public void DispalySemanticBtn(Button refSemanticBtn, DataGridView dataGrids,string word) public void DispalySemanticBtn(Button refSemanticBtn, DataGridView dataGrids, string word)
{ {
words = word; words = word;
DisplayBtn = refSemanticBtn; DisplayBtn = refSemanticBtn;

View File

@ -1,11 +1,8 @@
using System; using System;
using System.Collections.Generic; using System.Collections.Generic;
using System.Linq;
using System.Text;
using System.Threading.Tasks;
using System.Data; using System.Data;
using System.Windows.Forms;
using System.Drawing; using System.Drawing;
using System.Windows.Forms;
namespace Aml.Editor.Plugin namespace Aml.Editor.Plugin
{ {
@ -27,7 +24,7 @@ namespace Aml.Editor.Plugin
return AMLAttributeParameters; return AMLAttributeParameters;
} }
public void CreateDataTableWithColumns( DataTable dataRowName, DataGridView dataGridViewName, public void CreateDataTableWithColumns(DataTable dataRowName, DataGridView dataGridViewName,
KeyValuePair<string, List<List<ClassOfListsFromReferencefile>>> pair) KeyValuePair<string, List<List<ClassOfListsFromReferencefile>>> pair)
{ {
KeyValuePair<string, List<List<ClassOfListsFromReferencefile>>> Pair = pair; KeyValuePair<string, List<List<ClassOfListsFromReferencefile>>> Pair = pair;
@ -111,10 +108,10 @@ namespace Aml.Editor.Plugin
{ {
try try
{ {
/* if (eachrow.Cells[0].Value.Equals(item.Name)) /* if (eachrow.Cells[0].Value.Equals(item.Name))
{ {
}*/ }*/
} }
catch (Exception) { } catch (Exception) { }
} }
@ -145,7 +142,7 @@ namespace Aml.Editor.Plugin
/* break;*/ /* break;*/

View File

@ -1,10 +1,4 @@
using System; namespace Aml.Editor.Plugin
using System.Collections.Generic;
using System.Linq;
using System.Text;
using System.Threading.Tasks;
namespace Aml.Editor.Plugin
{ {
class ClassOfListsFromDataGridViews class ClassOfListsFromDataGridViews
{ {

View File

@ -1,10 +1,4 @@
using System; using Aml.Engine.CAEX;
using System.Collections.Generic;
using System.Linq;
using System.Text;
using System.Threading.Tasks;
using Aml.Engine.AmlObjects;
using Aml.Engine.CAEX;
namespace Aml.Editor.Plugin namespace Aml.Editor.Plugin
{ {
@ -20,7 +14,7 @@ namespace Aml.Editor.Plugin
public string CopyRight { get; set; } public string CopyRight { get; set; }
public string AttributePath { get; set; } public string AttributePath { get; set; }
public string RefBaseClassPath { get; set; } public string RefBaseClassPath { get; set; }
public string ID { get; set; } public string ID { get; set; }
public string ReferencedClassName { get; set; } public string ReferencedClassName { get; set; }
public CAEXSequence<RefSemanticType> RefSemanticList { get; set; } public CAEXSequence<RefSemanticType> RefSemanticList { get; set; }
public string SupportesRoleClassType { get; set; } public string SupportesRoleClassType { get; set; }
@ -31,7 +25,7 @@ namespace Aml.Editor.Plugin
public ClassOfListsFromReferencefile() public ClassOfListsFromReferencefile()
{ {
// RefSemanticList = new List<CAEXSequence<RefSemanticType>>(); // RefSemanticList = new List<CAEXSequence<RefSemanticType>>();
} }
public ClassOfListsFromReferencefile(string name, string value, public ClassOfListsFromReferencefile(string name, string value,
@ -61,8 +55,8 @@ namespace Aml.Editor.Plugin
public override string ToString() public override string ToString()
{ {
return "ClassOfListsFromReferencefile("+Name+"="+Value+"="+Default+"="+Unit+"="+Reference+"=" return "ClassOfListsFromReferencefile(" + Name + "=" + Value + "=" + Default + "=" + Unit + "=" + Reference + "="
+Description+"="+CopyRight+"="+Semantic+"="+AttributePath+ "=" + RefBaseClassPath + "=" + ID + Description + "=" + CopyRight + "=" + Semantic + "=" + AttributePath + "=" + RefBaseClassPath + "=" + ID
+ "=" + ReferencedClassName + "=" + RefSemanticList + "=" + SupportesRoleClassType + "=" + DataType + ")"; + "=" + ReferencedClassName + "=" + RefSemanticList + "=" + SupportesRoleClassType + "=" + DataType + ")";
} }
} }

View File

@ -8,7 +8,6 @@ using System.IO;
using System.IO.Packaging; using System.IO.Packaging;
using System.Linq; using System.Linq;
using System.Windows.Forms; using System.Windows.Forms;
using Aml.Engine.AmlObjects.Extensions;
/// <summary> /// <summary>

View File

@ -63,7 +63,7 @@ namespace Aml.Editor.Plugin
if (newDevice.deviceName != null && newDevice.vendorName != null) if (newDevice.deviceName != null && newDevice.vendorName != null)
{ {
// create the device // create the device
result = mWData.CreateDevice(newDevice, isEdit); result = mWData.CreateDevice(newDevice, isEdit);
} }
// update the device list // update the device list

View File

@ -7,7 +7,6 @@ using System.IO.Packaging;
using System.Linq; using System.Linq;
using System.Reflection; using System.Reflection;
using System.Text.RegularExpressions; using System.Text.RegularExpressions;
using System.Windows.Forms;
namespace Aml.Editor.Plugin namespace Aml.Editor.Plugin
{ {
@ -76,7 +75,7 @@ namespace Aml.Editor.Plugin
} }
else else
{ {
amlFilePath = System.IO.Path.Combine(device.filepath, fileName + ".amlx"); amlFilePath = System.IO.Path.Combine(device.filepath, fileName + ".amlx");
} }
@ -130,15 +129,15 @@ namespace Aml.Editor.Plugin
// Init the default Libs // Init the default Libs
AutomationMLBaseRoleClassLibType.RoleClassLib(document) ; AutomationMLBaseRoleClassLibType.RoleClassLib(document);
AutomationMLInterfaceClassLibType.InterfaceClassLib(document) ; AutomationMLInterfaceClassLibType.InterfaceClassLib(document);
var structureRoleFamilyType = AutomationMLBaseRoleClassLibType.RoleClassLib(document).Structure; var structureRoleFamilyType = AutomationMLBaseRoleClassLibType.RoleClassLib(document).Structure;
SystemUnitFamilyType systemUnitClass = null; SystemUnitFamilyType systemUnitClass = null;
// Create the SystemUnitClass for our device // Create the SystemUnitClass for our device
if (!isEdit) if (!isEdit)
{ {
systemUnitClass = document.CAEXFile.SystemUnitClassLib.Append("ComponentSystemUnitClassLib").SystemUnitClass.Append(device.deviceName); systemUnitClass = document.CAEXFile.SystemUnitClassLib.Append("ComponentSystemUnitClassLib").SystemUnitClass.Append(device.deviceName);
@ -336,7 +335,7 @@ namespace Aml.Editor.Plugin
if (device.vendorName != null) if (device.vendorName != null)
{ {
InternalElementType electricalInterface = null; InternalElementType electricalInterface = null;
RoleRequirementsType roleRequirements = null ; RoleRequirementsType roleRequirements = null;
foreach (var internalElement in systemUnitClass.InternalElement) foreach (var internalElement in systemUnitClass.InternalElement)
{ {
if (internalElement.Name.Equals("Interfaces")) if (internalElement.Name.Equals("Interfaces"))
@ -349,9 +348,9 @@ namespace Aml.Editor.Plugin
} }
if (electricalInterface == null) if (electricalInterface == null)
electricalInterface = systemUnitClass.InternalElement.Append("Interfaces"); electricalInterface = systemUnitClass.InternalElement.Append("Interfaces");
roleRequirements = electricalInterface.RoleRequirements.Append(); roleRequirements = electricalInterface.RoleRequirements.Append();
roleRequirements.RefBaseRoleClassPath = structureRoleFamilyType.CAEXPath(); roleRequirements.RefBaseRoleClassPath = structureRoleFamilyType.CAEXPath();
foreach (var pair in device.DictionaryForInterfaceClassesInElectricalInterfaces) foreach (var pair in device.DictionaryForInterfaceClassesInElectricalInterfaces)
{ {
@ -473,7 +472,7 @@ namespace Aml.Editor.Plugin
string electricalConnectorPinName = Regex.Replace(pairofList.Key.ToString(), @"\(.*?\)", ""); string electricalConnectorPinName = Regex.Replace(pairofList.Key.ToString(), @"\(.*?\)", "");
electricalConnectorPinName = Regex.Replace(electricalConnectorPinName, @"\{.*?\}", ""); electricalConnectorPinName = Regex.Replace(electricalConnectorPinName, @"\{.*?\}", "");
electricalConnectorPinName = electricalConnectorPinName.Replace(electricalConnectorTypeName,""); electricalConnectorPinName = electricalConnectorPinName.Replace(electricalConnectorTypeName, "");
@ -600,7 +599,7 @@ namespace Aml.Editor.Plugin
PackagePart root = amlx.AddRoot(path, partUri); PackagePart root = amlx.AddRoot(path, partUri);
if (!isEdit) if (!isEdit)
{ {
foreach (AttachablesDataGridViewParameters listWithUri in device.listWithURIConvertedToString) foreach (AttachablesDataGridViewParameters listWithUri in device.listWithURIConvertedToString)
{ {
@ -615,12 +614,12 @@ namespace Aml.Editor.Plugin
DirectoryInfo directory = new DirectoryInfo(Path.GetDirectoryName(amlFilePath)); DirectoryInfo directory = new DirectoryInfo(Path.GetDirectoryName(amlFilePath));
foreach (FileInfo fileInfos in directory.GetFiles()) foreach (FileInfo fileInfos in directory.GetFiles())
{ {
if (fileInfos.Extension != ".amlx") if (fileInfos.Extension != ".amlx")
{ {
fileInfos.Delete(); fileInfos.Delete();
} }
} }
amlx.Save(); amlx.Save();
@ -1007,11 +1006,11 @@ namespace Aml.Editor.Plugin
if (name.Contains(".amlx")) if (name.Contains(".amlx"))
{ {
amlx = new AutomationMLContainer(".\\modellingwizard\\" + name, FileMode.Create); amlx = new AutomationMLContainer(".\\modellingwizard\\" + name, FileMode.Create);
} }
else else
{ {
amlx = new AutomationMLContainer(".\\modellingwizard\\" + name + ".amlx", FileMode.Create); amlx = new AutomationMLContainer(".\\modellingwizard\\" + name + ".amlx", FileMode.Create);
} }
// create the aml package path // create the aml package path
@ -1045,7 +1044,7 @@ namespace Aml.Editor.Plugin
// Just as an interface // Just as an interface
} }
public void copyFiles(string sourceFilePath, string destinationFilePath ) public void copyFiles(string sourceFilePath, string destinationFilePath)
{ {
string sourFile = Path.GetFileName(sourceFilePath); string sourFile = Path.GetFileName(sourceFilePath);
string destFile = Path.Combine(destinationFilePath, sourFile); string destFile = Path.Combine(destinationFilePath, sourFile);

View File

@ -1,13 +1,10 @@
using System; using System;
using System.Collections.Generic; using System.Collections.Generic;
using System.Linq;
using System.Text;
using System.Threading.Tasks;
namespace Aml.Editor.Plugin namespace Aml.Editor.Plugin
{ {
// this class initialize the parameters exclusively for the "Device Identofication", "DataGridViews in "Generic Data Tab" AND "Field Attachables Tab"" // this class initialize the parameters exclusively for the "Device Identofication", "DataGridViews in "Generic Data Tab" AND "Field Attachables Tab""
public class MWDevice: MWData.MWObject public class MWDevice : MWData.MWObject
{ {
public string environment { get; set; } public string environment { get; set; }
public string fileName { get; set; } public string fileName { get; set; }
@ -67,7 +64,7 @@ namespace Aml.Editor.Plugin
public DataGridParameters(string refSemantic, string attributes, string value) public DataGridParameters(string refSemantic, string attributes, string value)
{ {
this.RefSemantics = refSemantic; this.RefSemantics = refSemantic;
this.Attributes = attributes; this.Attributes = attributes;
this.Values = value; this.Values = value;
} }
@ -103,7 +100,7 @@ namespace Aml.Editor.Plugin
} }
public ElectricalParameters(string connector, string connectorCode, string connectorType,string pins,string lis) public ElectricalParameters(string connector, string connectorCode, string connectorType, string pins, string lis)
{ {
this.Connector = connector; this.Connector = connector;
@ -124,7 +121,7 @@ namespace Aml.Editor.Plugin
public override string ToString() public override string ToString()
{ {
return "ElectricalParameters(" + Connector + "=" + ConnectorCode + "=" + ConnectorType + "="+Pins+")"; return "ElectricalParameters(" + Connector + "=" + ConnectorCode + "=" + ConnectorType + "=" + Pins + ")";
} }
} }
@ -152,7 +149,7 @@ namespace Aml.Editor.Plugin
} }
public override string ToString() public override string ToString()
{ {
return "ElectricalParametersInElectricalDataDataGridView("+ ReferenceID + "=" + Attributes + "=" + Values + "=" + Units + ")"; return "ElectricalParametersInElectricalDataDataGridView(" + ReferenceID + "=" + Attributes + "=" + Values + "=" + Units + ")";
} }
} }
@ -168,7 +165,7 @@ namespace Aml.Editor.Plugin
{ {
} }
public PinParametersInPinInfoDataGridView(string pinNumber,string referenceID, string attribute, string values, string units) public PinParametersInPinInfoDataGridView(string pinNumber, string referenceID, string attribute, string values, string units)
{ {
this.PinNumber = pinNumber; this.PinNumber = pinNumber;
this.ReferenceID = referenceID; this.ReferenceID = referenceID;
@ -179,7 +176,7 @@ namespace Aml.Editor.Plugin
} }
public override string ToString() public override string ToString()
{ {
return "PinParametersInPinInfoDataGridView(" +PinNumber+"="+ ReferenceID + "=" + Attributes + "=" + Values + "=" + Units + ")"; return "PinParametersInPinInfoDataGridView(" + PinNumber + "=" + ReferenceID + "=" + Attributes + "=" + Values + "=" + Units + ")";
} }
} }
@ -188,7 +185,7 @@ namespace Aml.Editor.Plugin
{ {
public string ElementName { get; set; } public string ElementName { get; set; }
public string FilePath { get; set; } public string FilePath { get; set; }
public string AddToFile { get; set; } public string AddToFile { get; set; }
public AttachablesDataGridViewParameters() public AttachablesDataGridViewParameters()
{ {
@ -202,7 +199,7 @@ namespace Aml.Editor.Plugin
} }
public override string ToString() public override string ToString()
{ {
return "AttachablesDataGridViewParameters(" + ElementName + "=" + FilePath +"="+ AddToFile + ")"; return "AttachablesDataGridViewParameters(" + ElementName + "=" + FilePath + "=" + AddToFile + ")";
} }
} }

View File

@ -1,5 +1,4 @@
using System.Reflection; using System.Reflection;
using System.Runtime.CompilerServices;
using System.Runtime.InteropServices; using System.Runtime.InteropServices;
// Allgemeine Informationen über eine Assembly werden über die folgenden // Allgemeine Informationen über eine Assembly werden über die folgenden

View File

@ -1,9 +1,6 @@
using System; using Aml.Engine.CAEX;
using System;
using System.Collections.Generic; using System.Collections.Generic;
using System.Linq;
using System.Text;
using System.Threading.Tasks;
using Aml.Engine.CAEX;
namespace Aml.Editor.Plugin namespace Aml.Editor.Plugin
{ {
@ -30,7 +27,7 @@ namespace Aml.Editor.Plugin
foreach (var attribute in externalInterface.Attribute) foreach (var attribute in externalInterface.Attribute)
{ {
StoreEachAttributeValueInListOfExternalIterface(i, attributelist, attribute, externalInterface); StoreEachAttributeValueInListOfExternalIterface(i, attributelist, attribute, externalInterface);
CkeckForNestedAttributesOfExternalIterface(i,attribute, externalInterface); CkeckForNestedAttributesOfExternalIterface(i, attribute, externalInterface);
} }
@ -43,7 +40,7 @@ namespace Aml.Editor.Plugin
list.Add(sublist); list.Add(sublist);
try try
{ {
if (DictionaryofElectricalConnectorType.ContainsKey( "("+i+")"+ externalInterface.Name.ToString()+ "{" + "Class:" + " " + externalInterface.BaseClass + "}")) if (DictionaryofElectricalConnectorType.ContainsKey("(" + i + ")" + externalInterface.Name.ToString() + "{" + "Class:" + " " + externalInterface.BaseClass + "}"))
{ {
DictionaryofElectricalConnectorType["(" + i + ")" + externalInterface.Name.ToString() DictionaryofElectricalConnectorType["(" + i + ")" + externalInterface.Name.ToString()
+ "{" + "Class:" + " " + externalInterface.BaseClass + "}"].AddRange(list); + "{" + "Class:" + " " + externalInterface.BaseClass + "}"].AddRange(list);
@ -64,7 +61,7 @@ namespace Aml.Editor.Plugin
} }
public void CkeckForNestedAttributesOfExternalIterface(int i, AttributeType attributeType, ExternalInterfaceType externalInterface) public void CkeckForNestedAttributesOfExternalIterface(int i, AttributeType attributeType, ExternalInterfaceType externalInterface)
{ {
List<List<ClassOfListsFromReferencefile>> attributelist = new List<List<ClassOfListsFromReferencefile>>(); List<List<ClassOfListsFromReferencefile>> attributelist = new List<List<ClassOfListsFromReferencefile>>();
if (attributeType.Attribute.Exists) if (attributeType.Attribute.Exists)
@ -73,7 +70,7 @@ namespace Aml.Editor.Plugin
foreach (var attributeinattribute in attributeType.Attribute) foreach (var attributeinattribute in attributeType.Attribute)
{ {
StoreEachAttributeValueInListOfExternalIterface(i, attributelist, attributeinattribute, attributeType, externalInterface); StoreEachAttributeValueInListOfExternalIterface(i, attributelist, attributeinattribute, attributeType, externalInterface);
CkeckForNestedAttributesOfExternalIterface(i,attributeinattribute, externalInterface); CkeckForNestedAttributesOfExternalIterface(i, attributeinattribute, externalInterface);
} }
@ -116,7 +113,7 @@ namespace Aml.Editor.Plugin
attributeparameters.CopyRight = attributeType.Copyright; attributeparameters.CopyRight = attributeType.Copyright;
attributeparameters.AttributePath = attributeType.AttributePath; attributeparameters.AttributePath = attributeType.AttributePath;
attributeparameters.RefSemanticList = attributeType.RefSemantic; attributeparameters.RefSemanticList = attributeType.RefSemantic;
// attributeparameters.ReferencedClassName = externalInterface.BaseClass.ToString(); // attributeparameters.ReferencedClassName = externalInterface.BaseClass.ToString();
attributeparameters.RefBaseClassPath = externalInterface.RefBaseClassPath; attributeparameters.RefBaseClassPath = externalInterface.RefBaseClassPath;
attributeparameters.ID = externalInterface.ID; attributeparameters.ID = externalInterface.ID;
@ -163,7 +160,7 @@ namespace Aml.Editor.Plugin
attributeparameters.CopyRight = AttributeInAttribute.Copyright; attributeparameters.CopyRight = AttributeInAttribute.Copyright;
attributeparameters.AttributePath = AttributeInAttribute.AttributePath; attributeparameters.AttributePath = AttributeInAttribute.AttributePath;
attributeparameters.RefSemanticList = AttributeInAttribute.RefSemantic; attributeparameters.RefSemanticList = AttributeInAttribute.RefSemantic;
// attributeparameters.ReferencedClassName = externalInterface.BaseClass.ToString(); // attributeparameters.ReferencedClassName = externalInterface.BaseClass.ToString();
attributeparameters.RefBaseClassPath = externalInterface.RefBaseClassPath; attributeparameters.RefBaseClassPath = externalInterface.RefBaseClassPath;
attributeparameters.ID = externalInterface.ID; attributeparameters.ID = externalInterface.ID;
@ -279,7 +276,7 @@ namespace Aml.Editor.Plugin
attributeparameters.CopyRight = attributeType.Copyright; attributeparameters.CopyRight = attributeType.Copyright;
attributeparameters.AttributePath = attributeType.AttributePath; attributeparameters.AttributePath = attributeType.AttributePath;
attributeparameters.RefSemanticList = attributeType.RefSemantic; attributeparameters.RefSemanticList = attributeType.RefSemantic;
// attributeparameters.ReferencedClassName = externalInterface.BaseClass.ToString(); // attributeparameters.ReferencedClassName = externalInterface.BaseClass.ToString();
attributeparameters.RefBaseClassPath = externalInterface.RefBaseClassPath; attributeparameters.RefBaseClassPath = externalInterface.RefBaseClassPath;
attributeparameters.ID = externalInterface.ID; attributeparameters.ID = externalInterface.ID;
@ -369,7 +366,7 @@ namespace Aml.Editor.Plugin
list.Add(sublist); list.Add(sublist);
try try
{ {
if (DictionaryofRolesforAutomationComponenet.ContainsKey("(" + i + ")" + supportedRoleClass.RoleReference.ToString() )) if (DictionaryofRolesforAutomationComponenet.ContainsKey("(" + i + ")" + supportedRoleClass.RoleReference.ToString()))
{ {
DictionaryofRolesforAutomationComponenet["(" + i + ")" + supportedRoleClass.RoleReference.ToString()].AddRange(list); DictionaryofRolesforAutomationComponenet["(" + i + ")" + supportedRoleClass.RoleReference.ToString()].AddRange(list);
} }

View File

@ -1,18 +1,8 @@
using System; using Aml.Engine.CAEX;
using System;
using System.Collections.Generic; using System.Collections.Generic;
using System.Linq;
using System.Text;
using System.Threading.Tasks;
using System.Drawing; using System.Drawing;
using System.Windows.Forms; using System.Windows.Forms;
using Aml.Engine.AmlObjects;
using Aml.Engine.CAEX;
using System.IO;
using System.IO.Packaging;
using System.Xml;
using System.Collections;
using System.IO.Compression;
using Aml.Editor.Plugin.Contracts;
namespace Aml.Editor.Plugin namespace Aml.Editor.Plugin
{ {
@ -129,7 +119,7 @@ namespace Aml.Editor.Plugin
foreach (var item in classTypeSearchForReferencedClassName.InterfaceClass) foreach (var item in classTypeSearchForReferencedClassName.InterfaceClass)
{ {
//If "Refrenced Class Name" is existing... //If "Refrenced Class Name" is existing...
if (item.Name == referencedClassName) if (item.Name == referencedClassName)
{ {
//If external Interface is existing.... //If external Interface is existing....
if (item.ExternalInterface.Exists) if (item.ExternalInterface.Exists)
@ -159,7 +149,7 @@ namespace Aml.Editor.Plugin
} }
} }
//If "Interface Class" inside "Interface Class" is existng.... //If "Interface Class" inside "Interface Class" is existng....
if (item.InterfaceClass.Exists) if (item.InterfaceClass.Exists)
{ {
//This class is responsible to search for interface classes ´nested inside Interface classes and recursion of //This class is responsible to search for interface classes ´nested inside Interface classes and recursion of
@ -191,7 +181,7 @@ namespace Aml.Editor.Plugin
list.Add(sublist); list.Add(sublist);
try try
{ {
if (DictionaryForInterfaceClassInstancesAttributes.ContainsKey(classType.Name.ToString()+"{"+ "Class:" + " " +classType.ReferencedClassName+"}")) if (DictionaryForInterfaceClassInstancesAttributes.ContainsKey(classType.Name.ToString() + "{" + "Class:" + " " + classType.ReferencedClassName + "}"))
{ {
DictionaryForInterfaceClassInstancesAttributes[classType.Name.ToString() + "{" + "Class:" + " " + classType.ReferencedClassName + "}"].AddRange(list); DictionaryForInterfaceClassInstancesAttributes[classType.Name.ToString() + "{" + "Class:" + " " + classType.ReferencedClassName + "}"].AddRange(list);
} }
@ -328,7 +318,7 @@ namespace Aml.Editor.Plugin
List<List<ClassOfListsFromReferencefile>> list = new List<List<ClassOfListsFromReferencefile>>(); List<List<ClassOfListsFromReferencefile>> list = new List<List<ClassOfListsFromReferencefile>>();
List<ClassOfListsFromReferencefile> sublist = new List<ClassOfListsFromReferencefile>(); List<ClassOfListsFromReferencefile> sublist = new List<ClassOfListsFromReferencefile>();
//Add sublist to list //Add sublist to list
list.Add(sublist); list.Add(sublist);
//If dictioanry contains key , update the values under the key //If dictioanry contains key , update the values under the key
if (DictionaryForInterfaceClassInstancesAttributes.ContainsKey(classType.Name.ToString() + "{" + "Class:" + " " + classType.ReferencedClassName + "}")) if (DictionaryForInterfaceClassInstancesAttributes.ContainsKey(classType.Name.ToString() + "{" + "Class:" + " " + classType.ReferencedClassName + "}"))
@ -619,7 +609,7 @@ namespace Aml.Editor.Plugin
List<List<ClassOfListsFromReferencefile>> list = new List<List<ClassOfListsFromReferencefile>>(); List<List<ClassOfListsFromReferencefile>> list = new List<List<ClassOfListsFromReferencefile>>();
List<ClassOfListsFromReferencefile> sublist = new List<ClassOfListsFromReferencefile>(); List<ClassOfListsFromReferencefile> sublist = new List<ClassOfListsFromReferencefile>();
//Add sub list to list //Add sub list to list
list.Add(sublist); list.Add(sublist);
//IF dictionary is having the key, the update the values for the key. //IF dictionary is having the key, the update the values for the key.
@ -1049,7 +1039,7 @@ namespace Aml.Editor.Plugin
List<ClassOfListsFromReferencefile> sublist = new List<ClassOfListsFromReferencefile>(); List<ClassOfListsFromReferencefile> sublist = new List<ClassOfListsFromReferencefile>();
ClassOfListsFromReferencefile attributeparameters = new ClassOfListsFromReferencefile(); ClassOfListsFromReferencefile attributeparameters = new ClassOfListsFromReferencefile();
//Store every parameter value.... //Store every parameter value....
attributeparameters.Name = attributeType.Name; attributeparameters.Name = attributeType.Name;
attributeparameters.Value = attributeType.Value; attributeparameters.Value = attributeType.Value;
@ -1775,7 +1765,7 @@ namespace Aml.Editor.Plugin
foreach (var externalinterfaces in item.ExternalInterface) foreach (var externalinterfaces in item.ExternalInterface)
{ {
TreeNode externalinterafcenode; TreeNode externalinterafcenode;
if (externalinterfaces.BaseClass != null && externalinterfaces.BaseClass.ToString() != externalinterfaces.Name.ToString() ) if (externalinterfaces.BaseClass != null && externalinterfaces.BaseClass.ToString() != externalinterfaces.Name.ToString())
{ {
referencedClassName = externalinterfaces.BaseClass.ToString(); referencedClassName = externalinterfaces.BaseClass.ToString();
externalinterafcenode = newnode.Nodes.Add(externalinterfaces.ToString(), externalinterfaces.ToString() + "{" + "Class:" + " " + referencedClassName + "}", 2); externalinterafcenode = newnode.Nodes.Add(externalinterfaces.ToString(), externalinterfaces.ToString() + "{" + "Class:" + " " + referencedClassName + "}", 2);
@ -1835,7 +1825,7 @@ namespace Aml.Editor.Plugin
foreach (var externalinterfaces in item.ExternalInterface) foreach (var externalinterfaces in item.ExternalInterface)
{ {
TreeNode externalinterafcenode; TreeNode externalinterafcenode;
if (externalinterfaces.BaseClass!= null) if (externalinterfaces.BaseClass != null)
{ {
referencedclassName = externalinterfaces.BaseClass.ToString(); referencedclassName = externalinterfaces.BaseClass.ToString();
@ -1852,7 +1842,7 @@ namespace Aml.Editor.Plugin
} }
PrintExternalInterfaceNodes(document,externalinterafcenode, externalinterfaces, classType); PrintExternalInterfaceNodes(document, externalinterafcenode, externalinterfaces, classType);
} }
} }
@ -1865,7 +1855,7 @@ namespace Aml.Editor.Plugin
/// </summary> /// </summary>
/// <param name="oParentNode"></param> /// <param name="oParentNode"></param>
/// <param name="classType"></param> /// <param name="classType"></param>
public void PrintExternalInterfaceNodes(CAEXDocument document,TreeNode oParentNode, ExternalInterfaceType classType, InterfaceFamilyType InterafceclassType) public void PrintExternalInterfaceNodes(CAEXDocument document, TreeNode oParentNode, ExternalInterfaceType classType, InterfaceFamilyType InterafceclassType)
{ {
if (classType.ExternalInterface.Exists) if (classType.ExternalInterface.Exists)
{ {
@ -1873,7 +1863,7 @@ namespace Aml.Editor.Plugin
foreach (var item in classType.ExternalInterface) foreach (var item in classType.ExternalInterface)
{ {
TreeNode newnode; TreeNode newnode;
if (item.BaseClass!= null) if (item.BaseClass != null)
{ {
referencedClassName = item.BaseClass.ToString(); referencedClassName = item.BaseClass.ToString();
newnode = oParentNode.Nodes.Add(item.ToString(), item.ToString() + "{" + "Class:" + " " + referencedClassName + "}", 2); newnode = oParentNode.Nodes.Add(item.ToString(), item.ToString() + "{" + "Class:" + " " + referencedClassName + "}", 2);
@ -1883,7 +1873,7 @@ namespace Aml.Editor.Plugin
} }
else else
{ {
newnode = oParentNode.Nodes.Add(item.ToString(), item.ToString() , 2); newnode = oParentNode.Nodes.Add(item.ToString(), item.ToString(), 2);
newnode.ForeColor = SystemColors.GrayText; newnode.ForeColor = SystemColors.GrayText;
} }