From 3f0f32f147307b64bf27ef58a478e08ad2302f5c Mon Sep 17 00:00:00 2001 From: mpostol Date: Tue, 11 Feb 2020 22:14:49 +0100 Subject: [PATCH] Upgrade Windows.Form #95 - UAOOI.Windows.GUIAbstractions must be defined as the nuget. ModelDesigner.DesignStudio requires reference to it. Now the reference is added directly to the main packages folder - finished modification of ModelDesigner.DesignStudio and ModelDesigner.DesignStudio.UnitTest - UT :+1: --- ...ModelDesigner.DesignStudio.UnitTest.csproj | 15 +-- .../packages.config | 3 +- .../NodeObserver/ModelObserver.Designer.cs | 12 +- .../Controls/NodeObserver/ModelObserver.cs | 2 +- .../PropertyGridObserver.Designer.cs | 11 +- ModelDesigner.DesignStudio/Main.Designer.cs | 8 +- ModelDesigner.DesignStudio/Main.cs | 3 +- .../MainForm.Designer.cs | 6 +- ModelDesigner.DesignStudio/MainForm.cs | 7 +- .../ModelDesigner.DesignStudio.csproj | 17 ++- .../StartUpSplashScreen.cs | 20 +-- .../StateMachineEditor/StateMachineControl.cs | 98 ++++++++------- .../Wrappers/InstanceIdentifier.cs | 20 +-- .../Wrappers/UniqueIdentifier.cs | 24 ++-- .../Wrappers/WrapperTreeNode.cs | 51 +++----- .../DocumentationAttribute.cs | 21 +--- .../XmlQualifiedNameEditorWithDefaultValue.cs | 45 +++---- .../Wrappers4ProperyGrid/NodeDesign.cs | 64 +++------- .../Wrappers4ProperyGrid/Nodes.Properties.cs | 20 +-- ModelDesigner.DesignStudio/app.config | 116 +++++++++--------- ModelDesigner.DesignStudio/packages.config | 13 +- 21 files changed, 243 insertions(+), 333 deletions(-) diff --git a/ModelDesigner.DesignStudio.UnitTest/ModelDesigner.DesignStudio.UnitTest.csproj b/ModelDesigner.DesignStudio.UnitTest/ModelDesigner.DesignStudio.UnitTest.csproj index d7bf9258..b73b26ef 100644 --- a/ModelDesigner.DesignStudio.UnitTest/ModelDesigner.DesignStudio.UnitTest.csproj +++ b/ModelDesigner.DesignStudio.UnitTest/ModelDesigner.DesignStudio.UnitTest.csproj @@ -70,18 +70,6 @@ ..\packages\CAS.CommServer.UA.Stack.Core.1.01.3265\lib\net451\CAS.CommServer.UA.Stack.Core.dll True - - ..\packages\CAS.RealTime.5.0.6\lib\net451\CAS.RealTime.dll - True - - - ..\packages\CAS.RealTime.5.0.6\lib\net451\CAS.RealTime.Core.dll - True - - - ..\packages\CAS.Windows.Forms.6.1.2\lib\net451\CAS.Windows.Forms.dll - True - ..\packages\Castle.Core.4.4.0\lib\net45\Castle.Core.dll @@ -113,6 +101,9 @@ ..\packages\UAOOI.SemanticData.UANodeSetValidation.2.0.0-Alpha\lib\net461\UAOOI.SemanticDataUANodeSetValidation.dll True + + ..\packages\UAOOI.Windows.Forms.7.0.3-Delta\lib\net451\UAOOI.Windows.Forms.dll + diff --git a/ModelDesigner.DesignStudio.UnitTest/packages.config b/ModelDesigner.DesignStudio.UnitTest/packages.config index b10f2c05..5993e681 100644 --- a/ModelDesigner.DesignStudio.UnitTest/packages.config +++ b/ModelDesigner.DesignStudio.UnitTest/packages.config @@ -5,9 +5,7 @@ - - @@ -15,4 +13,5 @@ + \ No newline at end of file diff --git a/ModelDesigner.DesignStudio/Controls/NodeObserver/ModelObserver.Designer.cs b/ModelDesigner.DesignStudio/Controls/NodeObserver/ModelObserver.Designer.cs index 7a8ae610..7f640691 100644 --- a/ModelDesigner.DesignStudio/Controls/NodeObserver/ModelObserver.Designer.cs +++ b/ModelDesigner.DesignStudio/Controls/NodeObserver/ModelObserver.Designer.cs @@ -1,4 +1,6 @@ -namespace CAS.UA.Model.Designer.Controls.NodeObserver +using UAOOI.Windows.Forms; + +namespace CAS.UA.Model.Designer.Controls.NodeObserver { partial class ModelObserver { @@ -33,8 +35,8 @@ private void InitializeComponent() this.m_TreeView = new DictionaryTreeView(); this.m_ImagesForNodes = new CAS.UA.Model.Designer.ImagesForNodes( this.components ); this.m_toolStripContainer = new System.Windows.Forms.ToolStripContainer(); - this.m_BackForwardTreViewToolStrip = new CAS.Lib.ControlLibrary.BackForwardTreViewToolStrip(); - this.m_SearchTreeViewToolStrip = new CAS.Lib.ControlLibrary.SearchTreeViewToolStrip(); + this.m_BackForwardTreViewToolStrip = new BackForwardTreViewToolStrip(); + this.m_SearchTreeViewToolStrip = new SearchTreeViewToolStrip(); this.m_ToolStripOtherTools = new System.Windows.Forms.ToolStrip(); this.toolStripButton_filter = new System.Windows.Forms.ToolStripButton(); this.m_toolStripContainer.ContentPanel.SuspendLayout(); @@ -147,8 +149,8 @@ private void InitializeComponent() private DictionaryTreeView m_TreeView; private ImagesForNodes m_ImagesForNodes; private System.Windows.Forms.ToolStripContainer m_toolStripContainer; - private CAS.Lib.ControlLibrary.BackForwardTreViewToolStrip m_BackForwardTreViewToolStrip; - private CAS.Lib.ControlLibrary.SearchTreeViewToolStrip m_SearchTreeViewToolStrip; + private BackForwardTreViewToolStrip m_BackForwardTreViewToolStrip; + private SearchTreeViewToolStrip m_SearchTreeViewToolStrip; private System.Windows.Forms.ToolStrip m_ToolStripOtherTools; private System.Windows.Forms.ToolStripButton toolStripButton_filter; } diff --git a/ModelDesigner.DesignStudio/Controls/NodeObserver/ModelObserver.cs b/ModelDesigner.DesignStudio/Controls/NodeObserver/ModelObserver.cs index dd58600e..8ddd3f14 100644 --- a/ModelDesigner.DesignStudio/Controls/NodeObserver/ModelObserver.cs +++ b/ModelDesigner.DesignStudio/Controls/NodeObserver/ModelObserver.cs @@ -4,7 +4,6 @@ // //___________________________________________________________________________________ -using CAS.Lib.ControlLibrary; using CAS.UA.Model.Designer.IO; using CAS.UA.Model.Designer.Properties; using CAS.UA.Model.Designer.Solution; @@ -14,6 +13,7 @@ using System.Drawing; using System.IO; using System.Windows.Forms; +using UAOOI.Windows.Forms; namespace CAS.UA.Model.Designer.Controls.NodeObserver { diff --git a/ModelDesigner.DesignStudio/Controls/NodeObserver/PropertyGridObserver.Designer.cs b/ModelDesigner.DesignStudio/Controls/NodeObserver/PropertyGridObserver.Designer.cs index 7908c232..99e8a80a 100644 --- a/ModelDesigner.DesignStudio/Controls/NodeObserver/PropertyGridObserver.Designer.cs +++ b/ModelDesigner.DesignStudio/Controls/NodeObserver/PropertyGridObserver.Designer.cs @@ -1,4 +1,7 @@ -namespace CAS.UA.Model.Designer.Controls.NodeObserver +using System.Windows.Forms; +using UAOOI.Windows.Forms; + +namespace CAS.UA.Model.Designer.Controls.NodeObserver { partial class PropertyGridObserver { @@ -30,7 +33,7 @@ private void InitializeComponent() { this.components = new System.ComponentModel.Container(); this.m_propertyGrid = new System.Windows.Forms.PropertyGrid(); - this.m_propertyGridExpandAllExpander = new CAS.Lib.ControlLibrary.PropertyGridExpandAllExpander( this.components ); + this.m_propertyGridExpandAllExpander = new PropertyGridExpandAllExpander( this.components ); this.SuspendLayout(); // // m_propertyGrid @@ -57,7 +60,7 @@ private void InitializeComponent() #endregion - private System.Windows.Forms.PropertyGrid m_propertyGrid; - private CAS.Lib.ControlLibrary.PropertyGridExpandAllExpander m_propertyGridExpandAllExpander; + private PropertyGrid m_propertyGrid; + private PropertyGridExpandAllExpander m_propertyGridExpandAllExpander; } } diff --git a/ModelDesigner.DesignStudio/Main.Designer.cs b/ModelDesigner.DesignStudio/Main.Designer.cs index b0a0c5e8..474982ba 100644 --- a/ModelDesigner.DesignStudio/Main.Designer.cs +++ b/ModelDesigner.DesignStudio/Main.Designer.cs @@ -1,4 +1,6 @@ -namespace CAS.UA.Model.Designer +using UAOOI.Windows.Forms; + +namespace CAS.UA.Model.Designer { partial class Main { @@ -46,7 +48,7 @@ private void InitializeComponent() this.m_TabPageDataBindings = new System.Windows.Forms.TabPage(); this.m_BindingsPropertyObserver = new CAS.UA.Model.Designer.Controls.NodeObserver.BindingsPropertyObserver(); this.m_HelpProvider = new System.Windows.Forms.HelpProvider(); - this.m_ViewTabControlManager = new CAS.Lib.ControlLibrary.TabControlManager(this.components); + this.m_ViewTabControlManager = new TabControlManager(this.components); this.m_selectedItemObserverComponent = new CAS.UA.Model.Designer.Controls.NodeObserver.SelectedItemObserverComponent(this.components); splitContainer1 = new System.Windows.Forms.SplitContainer(); m_TreeViewToolStripContainer = new System.Windows.Forms.ToolStripContainer(); @@ -306,7 +308,7 @@ private void InitializeComponent() private System.Windows.Forms.TabPage tabPage_tree_model; private System.Windows.Forms.TabPage tabPage_tree_browseView; private CAS.UA.Model.Designer.Controls.NodeObserver.BrowseViewObserver m_browseViewObserver; - private CAS.Lib.ControlLibrary.TabControlManager m_ViewTabControlManager; + private TabControlManager m_ViewTabControlManager; private System.Windows.Forms.TabPage tabPage_View3DModel; private CAS.UA.Model.Designer.Controls.NodeObserver.View3DModelObserver view3DModelObserver1; private CAS.UA.Model.Designer.Controls.NodeObserver.SelectedItemObserverComponent m_selectedItemObserverComponent; diff --git a/ModelDesigner.DesignStudio/Main.cs b/ModelDesigner.DesignStudio/Main.cs index 5536fa9a..bdb9dd05 100644 --- a/ModelDesigner.DesignStudio/Main.cs +++ b/ModelDesigner.DesignStudio/Main.cs @@ -4,13 +4,12 @@ // //___________________________________________________________________________________ -using CAS.Lib.ControlLibrary; using CAS.UA.Model.Designer.Properties; using CAS.UA.Model.Designer.Wrappers; -using System; using System.Collections.Generic; using System.IO; using System.Windows.Forms; +using UAOOI.Windows.Forms; namespace CAS.UA.Model.Designer { diff --git a/ModelDesigner.DesignStudio/MainForm.Designer.cs b/ModelDesigner.DesignStudio/MainForm.Designer.cs index d6f45c04..600912ff 100644 --- a/ModelDesigner.DesignStudio/MainForm.Designer.cs +++ b/ModelDesigner.DesignStudio/MainForm.Designer.cs @@ -1,4 +1,6 @@ using System.Windows.Forms; +using UAOOI.Windows.Forms; + namespace CAS.UA.Model.Designer { partial class MainForm @@ -40,7 +42,7 @@ private void InitializeComponent() this.tabPage_help = new System.Windows.Forms.TabPage(); this.helpUserControl = new CAS.UA.Model.Designer.Controls.NodeObserver.HelpUserControlObserver(); this.splitter_main = new System.Windows.Forms.Splitter(); - this.debugDockPanelUserControl1 = new CAS.Lib.ControlLibrary.DebugDockPanelUserControl(); + this.debugDockPanelUserControl1 = new DebugDockPanelUserControl(); this.menuStrip_MainMenu = new System.Windows.Forms.MenuStrip(); this.fileToolStripMenuItem = new System.Windows.Forms.ToolStripMenuItem(); this.newToolStripMenuItem = new System.Windows.Forms.ToolStripMenuItem(); @@ -1404,7 +1406,7 @@ private void InitializeComponent() private System.Windows.Forms.ToolStripMenuItem sendUsCommentToolStripMenuItem; private System.Windows.Forms.ToolStripMenuItem technicalSupportToolStripMenuItem; private System.Windows.Forms.ToolStripMenuItem customizeToolStripMenuItem; - private CAS.Lib.ControlLibrary.DebugDockPanelUserControl debugDockPanelUserControl1; + private DebugDockPanelUserControl debugDockPanelUserControl1; private System.Windows.Forms.Splitter splitter_main; private System.Windows.Forms.ToolStripMenuItem windowsToolStripMenuItem; private System.Windows.Forms.ToolStripMenuItem oPCViewerToolStripMenuItem; diff --git a/ModelDesigner.DesignStudio/MainForm.cs b/ModelDesigner.DesignStudio/MainForm.cs index 443cc13f..2d548739 100644 --- a/ModelDesigner.DesignStudio/MainForm.cs +++ b/ModelDesigner.DesignStudio/MainForm.cs @@ -4,15 +4,12 @@ // //___________________________________________________________________________________ -using CAS.Lib.ControlLibrary; -using CAS.Lib.ControlLibrary.ControlExtenders; using CAS.UA.Model.Designer.Controls; using CAS.UA.Model.Designer.ExportingTools; using CAS.UA.Model.Designer.IO; using CAS.UA.Model.Designer.Properties; using CAS.UA.Model.Designer.StateMachineEditor; using CAS.UA.Model.Designer.Wrappers; -using CAS.Windows.Forms.CodeProtectControls; using System; using System.ComponentModel; using System.Diagnostics; @@ -20,6 +17,9 @@ using System.Reflection; using System.Runtime.InteropServices; using System.Windows.Forms; +using UAOOI.Windows.Forms; +using UAOOI.Windows.Forms.CodeProtectControls; +using UAOOI.Windows.Forms.ControlExtenders; namespace CAS.UA.Model.Designer { @@ -352,6 +352,7 @@ private void goToToolStripMenuItem_DropDownOpening(object sender, EventArgs e) } } #endregion + private void HelpAboutUaModelDesignerToolStripMenuItem_Click(object sender, EventArgs e) { using (AboutForm dial = new AboutForm diff --git a/ModelDesigner.DesignStudio/ModelDesigner.DesignStudio.csproj b/ModelDesigner.DesignStudio/ModelDesigner.DesignStudio.csproj index 00cda0dc..514e07ec 100644 --- a/ModelDesigner.DesignStudio/ModelDesigner.DesignStudio.csproj +++ b/ModelDesigner.DesignStudio/ModelDesigner.DesignStudio.csproj @@ -100,27 +100,21 @@ ..\packages\CAS.CommServer.DA.Client.2.00.18\lib\net451\CAS.CommServer.DA.Client.Operations.dll - True ..\packages\CAS.CommServer.DA.Client.2.00.18\lib\net451\CAS.CommServer.DA.Client.Services.dll - True ..\packages\CAS.CommServer.DA.Viewer.3.11.17\lib\net451\CAS.CommServer.DA.Viewer.AddressSpace.dll - True ..\packages\CAS.CommServer.DA.Viewer.3.11.17\lib\net451\CAS.CommServer.DA.Viewer.FormControls.dll - True ..\packages\CAS.CommServer.DAClientConfiguration.5.01.06\lib\net451\CAS.CommServer.DAClientConfiguration.dll - True ..\packages\CAS.CommServer.DeviceSimulator.5.01.06\lib\net451\CAS.CommServer.DeviceSimulator.dll - True ..\packages\CAS.CommServer.OPCClassic.SDK.COMWrapper.2.01.1063\lib\net451\CAS.CommServer.OPCClassicSDK.COMWrapper.dll @@ -152,11 +146,9 @@ ..\packages\CAS.RealTime.5.0.6\lib\net451\CAS.RealTime.dll - True ..\packages\CAS.RealTime.5.0.6\lib\net451\CAS.RealTime.Core.dll - True ..\packages\CAS.UA.IServerConfiguration.1.00.00\lib\net35\CAS.UA.IServerConfiguration.dll @@ -164,7 +156,6 @@ ..\packages\CAS.Windows.Forms.6.1.2\lib\net451\CAS.Windows.Forms.dll - True 3.0 @@ -195,6 +186,12 @@ ..\packages\UAOOI.SemanticData.UANodeSetValidation.2.0.0-Alpha\lib\net461\UAOOI.SemanticDataUANodeSetValidation.dll True + + ..\packages\UAOOI.Windows.Forms.7.0.3-Delta\lib\net451\UAOOI.Windows.Forms.dll + + + ..\packages\UAOOI.Windows.Forms.7.0.3-Delta\lib\netstandard2.0\UAOOI.Windows.GUIAbstractions.dll + 3.0 @@ -517,10 +514,10 @@ Always - Always + diff --git a/ModelDesigner.DesignStudio/StartUpSplashScreen.cs b/ModelDesigner.DesignStudio/StartUpSplashScreen.cs index 31fb7699..5205c9d9 100644 --- a/ModelDesigner.DesignStudio/StartUpSplashScreen.cs +++ b/ModelDesigner.DesignStudio/StartUpSplashScreen.cs @@ -1,20 +1,12 @@ -// -// Title : Start Up Splash Screen -// System : Microsoft Visual C# .NET 2008 -// $LastChangedDate$ -// $Rev$ -// $LastChangedBy$ -// $URL$ -// $Id$ +//___________________________________________________________________________________ // -// Copyright (C)2010, CAS LODZ POLAND. -// TEL: +48 (42) 686 25 47 -// mailto://techsupp@cas.eu -// http://www.cas.eu -// +// Copyright (C) 2020, Mariusz Postol LODZ POLAND. +// +// To be in touch join the community at GITTER: https://gitter.im/mpostol/OPC-UA-OOI +//___________________________________________________________________________________ using CAS.UA.Model.Designer.Properties; -using CAS.Windows.Forms.CodeProtectControls; +using UAOOI.Windows.Forms.CodeProtectControls; namespace CAS.UA.Model.Designer { diff --git a/ModelDesigner.DesignStudio/StateMachineEditor/StateMachineControl.cs b/ModelDesigner.DesignStudio/StateMachineEditor/StateMachineControl.cs index 4cab4390..4d69da69 100644 --- a/ModelDesigner.DesignStudio/StateMachineEditor/StateMachineControl.cs +++ b/ModelDesigner.DesignStudio/StateMachineEditor/StateMachineControl.cs @@ -4,15 +4,15 @@ // //___________________________________________________________________________________ -using System; -using System.Windows.Forms; using CAS.UA.Model.Designer.Properties; using CAS.UA.Model.Designer.Wrappers; -using CAS.Lib.ControlLibrary; +using System; +using System.Windows.Forms; +using UAOOI.Windows.Forms; namespace CAS.UA.Model.Designer.StateMachineEditor { - internal partial class StateMachineControl: UserControl + internal partial class StateMachineControl : UserControl { #region constructors @@ -42,41 +42,45 @@ internal StateMachineControl() /// /// The source of the event. /// The instance containing the event data. - private void buttonTransition_Click( object sender, EventArgs e ) + private void buttonTransition_Click(object sender, EventArgs e) { selectedTransitionButton = sender as TransitionButton; - if ( ( (TransitionButton)sender ).Image == null ) //add new transition + if (((TransitionButton)sender).Image == null) //add new transition { - OKCancelForm newTransitionForm = new OKCancelForm( newTransitionString ); - newTransitionForm.CanBeAccepted( true ); - PropertyGrid propertyGridTransition = new PropertyGrid(); - propertyGridTransition.Anchor = ( AnchorStyles.Bottom | AnchorStyles.Right | AnchorStyles.Left | AnchorStyles.Top ); - propertyGridTransition.SelectedObject = selectedTransitionButton.TransitionData; + OKCancelForm newTransitionForm = new OKCancelForm(newTransitionString); + newTransitionForm.CanBeAccepted(true); + PropertyGrid propertyGridTransition = new PropertyGrid + { + Anchor = (AnchorStyles.Bottom | AnchorStyles.Right | AnchorStyles.Left | AnchorStyles.Top), + SelectedObject = selectedTransitionButton.TransitionData + }; UserControl uc = new UserControl(); uc.Controls.Add(propertyGridTransition); newTransitionForm.SetUserControl = uc; - if ( newTransitionForm.ShowDialog() == System.Windows.Forms.DialogResult.OK ) + if (newTransitionForm.ShowDialog() == System.Windows.Forms.DialogResult.OK) OnAddTransition(); else newTransitionForm.Close(); } else //show or delete transition { - OKCancelForm showOrDeleteTransitionDataForm = new OKCancelForm( transitionDataString ); - showOrDeleteTransitionDataForm.CanBeAccepted( true ); - showOrDeleteTransitionDataForm.AddButton( "Delete", System.Windows.Forms.DialogResult.Ignore ); - PropertyGrid propertyGridTransition = new PropertyGrid(); - propertyGridTransition.Anchor = ( AnchorStyles.Bottom | AnchorStyles.Right | AnchorStyles.Left | AnchorStyles.Top ); - propertyGridTransition.SelectedObject = selectedTransitionButton.TransitionData; + OKCancelForm showOrDeleteTransitionDataForm = new OKCancelForm(transitionDataString); + showOrDeleteTransitionDataForm.CanBeAccepted(true); + showOrDeleteTransitionDataForm.AddButton("Delete", System.Windows.Forms.DialogResult.Ignore); + PropertyGrid propertyGridTransition = new PropertyGrid + { + Anchor = (AnchorStyles.Bottom | AnchorStyles.Right | AnchorStyles.Left | AnchorStyles.Top), + SelectedObject = selectedTransitionButton.TransitionData + }; UserControl uc = new UserControl(); - uc.Controls.Add( propertyGridTransition ); + uc.Controls.Add(propertyGridTransition); showOrDeleteTransitionDataForm.SetUserControl = uc; System.Windows.Forms.DialogResult dr = showOrDeleteTransitionDataForm.ShowDialog(); - if ( dr == System.Windows.Forms.DialogResult.OK ) + if (dr == System.Windows.Forms.DialogResult.OK) OnOk(); - else if ( dr == System.Windows.Forms.DialogResult.Cancel ) + else if (dr == System.Windows.Forms.DialogResult.Cancel) Properties.Settings.Default.Reload(); - else if ( dr == System.Windows.Forms.DialogResult.Ignore ) + else if (dr == System.Windows.Forms.DialogResult.Ignore) OnDelete(); } } @@ -86,9 +90,9 @@ private void buttonTransition_Click( object sender, EventArgs e ) /// private void OnDelete() { - if ( selectedTransitionButton.TransitionData != null ) + if (selectedTransitionButton.TransitionData != null) { - ( (BaseTreeNode)selectedTransitionButton.TransitionData.InstanceDesignNode.Parent ).Parent.Remove( (BaseTreeNode)selectedTransitionButton.TransitionData.InstanceDesignNode.Parent ); + ((BaseTreeNode)selectedTransitionButton.TransitionData.InstanceDesignNode.Parent).Parent.Remove((BaseTreeNode)selectedTransitionButton.TransitionData.InstanceDesignNode.Parent); selectedTransitionButton.Image = null; selectedTransitionButton.FlatStyle = FlatStyle.Flat; } @@ -99,48 +103,48 @@ private void OnDelete() /// private void OnOk() { - if ( selectedTransitionButton.TransitionData != null ) + if (selectedTransitionButton.TransitionData != null) { ObjectDesign myObjectDesign = selectedTransitionButton.TransitionData.InstanceDesignNode.Parent as ObjectDesign; - if ( myObjectDesign != null ) + if (myObjectDesign != null) { - if ( myObjectDesign.References.Count > 2 ) + if (myObjectDesign.References.Count > 2) { - foreach ( Reference referenceAsBaseTreeNode in myObjectDesign.References ) + foreach (Reference referenceAsBaseTreeNode in myObjectDesign.References) { Reference reference = referenceAsBaseTreeNode as Reference; - if ( reference != null && reference.Wrapper.ReferenceType.Name == hasCauseString ) + if (reference != null && reference.Wrapper.ReferenceType.Name == hasCauseString) { string referenceNameOriginal; - if ( reference.Wrapper.TargetId.Name.Contains( "_" ) == true ) - referenceNameOriginal = ( reference.Wrapper.TargetId.Name ).Substring( ( reference.Wrapper.TargetId.Name ).LastIndexOf( "_" ), ( reference.Wrapper.TargetId.Name ).Length - ( reference.Wrapper.TargetId.Name ).LastIndexOf( "_" ) ).Replace( "_", "" ); + if (reference.Wrapper.TargetId.Name.Contains("_") == true) + referenceNameOriginal = (reference.Wrapper.TargetId.Name).Substring((reference.Wrapper.TargetId.Name).LastIndexOf("_"), (reference.Wrapper.TargetId.Name).Length - (reference.Wrapper.TargetId.Name).LastIndexOf("_")).Replace("_", ""); else referenceNameOriginal = reference.Wrapper.TargetId.Name; - if ( ( referenceNameOriginal != selectedTransitionButton.TransitionData.HasCause ) && ( string.IsNullOrEmpty( selectedTransitionButton.TransitionData.HasCause ) != true ) && ( string.IsNullOrEmpty( referenceNameOriginal ) != true ) ) + if ((referenceNameOriginal != selectedTransitionButton.TransitionData.HasCause) && (string.IsNullOrEmpty(selectedTransitionButton.TransitionData.HasCause) != true) && (string.IsNullOrEmpty(referenceNameOriginal) != true)) { - ( referenceAsBaseTreeNode as Reference ).Wrapper.TargetId.Name = selectedTransitionButton.TransitionData.HasCause; + (referenceAsBaseTreeNode as Reference).Wrapper.TargetId.Name = selectedTransitionButton.TransitionData.HasCause; return; } - else if ( ( referenceNameOriginal != selectedTransitionButton.TransitionData.HasCause ) && ( string.IsNullOrEmpty( selectedTransitionButton.TransitionData.HasCause ) == true ) ) + else if ((referenceNameOriginal != selectedTransitionButton.TransitionData.HasCause) && (string.IsNullOrEmpty(selectedTransitionButton.TransitionData.HasCause) == true)) { - ( (BaseTreeNode)( referenceAsBaseTreeNode as Reference ).Wrapper.Parent ).Parent.Remove( (BaseTreeNode)( referenceAsBaseTreeNode as Reference ).Wrapper.Parent ); + ((BaseTreeNode)(referenceAsBaseTreeNode as Reference).Wrapper.Parent).Parent.Remove((BaseTreeNode)(referenceAsBaseTreeNode as Reference).Wrapper.Parent); reference = null; return; } } } } - else if ( ( myObjectDesign.References.Count <= 2 ) && ( string.IsNullOrEmpty( selectedTransitionButton.TransitionData.HasCause ) != true ) ) + else if ((myObjectDesign.References.Count <= 2) && (string.IsNullOrEmpty(selectedTransitionButton.TransitionData.HasCause) != true)) { Reference reference = new Reference(); reference.Wrapper.IsOneWay = false; reference.Wrapper.IsInverse = false; reference.Wrapper.ReferenceType.Name = hasCauseString; - reference.Wrapper.ReferenceType.NameSpace = myObjectDesign.References.References[ 0 ].ReferenceType.Namespace; - reference.Wrapper.TargetId.Name = selectedTransitionButton.TransitionData.HasCause; - reference.Wrapper.TargetId.NameSpace = myObjectDesign.References.References[ 0 ].TargetId.Namespace; + reference.Wrapper.ReferenceType.NameSpace = myObjectDesign.References.References[0].ReferenceType.Namespace; + reference.Wrapper.TargetId.Name = selectedTransitionButton.TransitionData.HasCause; + reference.Wrapper.TargetId.NameSpace = myObjectDesign.References.References[0].TargetId.Namespace; reference.Wrapper.Validate(); - myObjectDesign.References.Add( reference ); + myObjectDesign.References.Add(reference); myObjectDesign.Wrapper.Validate(); return; } @@ -180,7 +184,7 @@ private void OnAddTransition() toStateReference.Wrapper.TargetId.NameSpace = selectedTransitionButton.SymbolicNameNameSpace; toStateReference.Wrapper.Validate(); Reference hasCauseReference = new Reference(); - if ( selectedTransitionButton.TransitionData.HasCause != null ) + if (selectedTransitionButton.TransitionData.HasCause != null) { hasCauseReference.Wrapper.IsOneWay = false; hasCauseReference.Wrapper.IsInverse = false; @@ -190,13 +194,13 @@ private void OnAddTransition() hasCauseReference.Wrapper.TargetId.NameSpace = selectedTransitionButton.SymbolicNameNameSpace; hasCauseReference.Wrapper.Validate(); } - newTransitionObjectDesign.References.Add( fromStateReference ); - newTransitionObjectDesign.References.Add( toStateReference ); + newTransitionObjectDesign.References.Add(fromStateReference); + newTransitionObjectDesign.References.Add(toStateReference); newTransitionObjectDesign.Wrapper.Validate(); - if ( !string.IsNullOrEmpty(hasCauseReference.Wrapper.TargetId.Name)) - newTransitionObjectDesign.References.Add( hasCauseReference ); - selectedTransitionButton.MachineObjectDesign.Children.Add( newTransitionObjectDesign ); - selectedTransitionButton.TransitionData = new Transition( selectedTransitionButton.TransitionData.FromState, selectedTransitionButton.TransitionData.ToState, selectedTransitionButton.TransitionData.HasCause, newTransitionObjectDesign.Wrapper ); + if (!string.IsNullOrEmpty(hasCauseReference.Wrapper.TargetId.Name)) + newTransitionObjectDesign.References.Add(hasCauseReference); + selectedTransitionButton.MachineObjectDesign.Children.Add(newTransitionObjectDesign); + selectedTransitionButton.TransitionData = new Transition(selectedTransitionButton.TransitionData.FromState, selectedTransitionButton.TransitionData.ToState, selectedTransitionButton.TransitionData.HasCause, newTransitionObjectDesign.Wrapper); selectedTransitionButton.Image = Resources.transition; selectedTransitionButton.FlatStyle = FlatStyle.Standard; } diff --git a/ModelDesigner.DesignStudio/Wrappers/InstanceIdentifier.cs b/ModelDesigner.DesignStudio/Wrappers/InstanceIdentifier.cs index 58080de3..8e83da5d 100644 --- a/ModelDesigner.DesignStudio/Wrappers/InstanceIdentifier.cs +++ b/ModelDesigner.DesignStudio/Wrappers/InstanceIdentifier.cs @@ -1,21 +1,13 @@ -// -// Title : Instance Identifier base class -// System : Microsoft Visual C# .NET 2008 -// $LastChangedDate$ -// $Rev$ -// $LastChangedBy$ -// $URL$ -// $Id$ +//___________________________________________________________________________________ // -// Copyright (C)2009, CAS LODZ POLAND. -// TEL: +48 (42) 686 25 47 -// mailto://techsupp@cas.eu -// http://www.cas.eu -// +// Copyright (C) 2020, Mariusz Postol LODZ POLAND. +// +// To be in touch join the community at GITTER: https://gitter.im/mpostol/OPC-UA-OOI +//___________________________________________________________________________________ -using CAS.Lib.ControlLibrary; using System; using System.Xml; +using UAOOI.Windows.Forms; namespace CAS.UA.Model.Designer.Wrappers { diff --git a/ModelDesigner.DesignStudio/Wrappers/UniqueIdentifier.cs b/ModelDesigner.DesignStudio/Wrappers/UniqueIdentifier.cs index 0ff68ecb..3d9faf56 100644 --- a/ModelDesigner.DesignStudio/Wrappers/UniqueIdentifier.cs +++ b/ModelDesigner.DesignStudio/Wrappers/UniqueIdentifier.cs @@ -1,26 +1,19 @@ -// -// Title : Instance Unique Identifier class -// System : Microsoft Visual C# .NET 2008 -// $LastChangedDate$ -// $Rev$ -// $LastChangedBy$ -// $URL$ -// $Id$ +//___________________________________________________________________________________ // -// Copyright (C)2009, CAS LODZ POLAND. -// TEL: +48 (42) 686 25 47 -// mailto://techsupp@cas.eu -// http://www.cas.eu -// +// Copyright (C) 2020, Mariusz Postol LODZ POLAND. +// +// To be in touch join the community at GITTER: https://gitter.im/mpostol/OPC-UA-OOI +//___________________________________________________________________________________ -using CAS.Lib.ControlLibrary; using System.Xml; +using UAOOI.Windows.Forms; namespace CAS.UA.Model.Designer.Wrappers { internal class UniqueIdentifier: InstanceIdentifier { - #region creator + + #region constructor internal UniqueIdentifier() { InstanceDeclaration = false; @@ -59,5 +52,6 @@ internal void Update( bool intermediate, XmlQualifiedName name, bool instanceDec return (UniqueIdentifier)base.MemberwiseClone(); } #endregion + } } diff --git a/ModelDesigner.DesignStudio/Wrappers/WrapperTreeNode.cs b/ModelDesigner.DesignStudio/Wrappers/WrapperTreeNode.cs index b442506c..726fe008 100644 --- a/ModelDesigner.DesignStudio/Wrappers/WrapperTreeNode.cs +++ b/ModelDesigner.DesignStudio/Wrappers/WrapperTreeNode.cs @@ -4,7 +4,6 @@ // //___________________________________________________________________________________ -using CAS.Lib.ControlLibrary; using CAS.UA.IServerConfiguration; using CAS.UA.Model.Designer.Properties; using System; @@ -13,6 +12,7 @@ using System.IO; using System.Xml; using System.Xml.Serialization; +using UAOOI.Windows.Forms; namespace CAS.UA.Model.Designer.Wrappers { @@ -22,10 +22,11 @@ namespace CAS.UA.Model.Designer.Wrappers /// internal abstract class WrapperTreeNode : BaseTreeNode, IModelNode, IModelNodeAdvance, IEnumerable { + #region public internal static object GetModelDesignerNodeFromStringRepresentationFromClipboard() { - string clipboard = String.Empty; + string clipboard = string.Empty; try { clipboard = System.Windows.Forms.Clipboard.GetText(); @@ -61,8 +62,10 @@ private static object GetModelDesignerNodeFromStringRepresentation(string modelD try { StringReader stringReader = new StringReader(modelDesignerNodeStringRepresentation); - XmlTextReader xmlTextReader = new XmlTextReader(stringReader); - xmlTextReader.WhitespaceHandling = WhitespaceHandling.None; + XmlTextReader xmlTextReader = new XmlTextReader(stringReader) + { + WhitespaceHandling = WhitespaceHandling.None + }; XmlDocument xmlDocument = new XmlDocument(); xmlDocument.Load(xmlTextReader); if (xmlDocument.DocumentElement == null) @@ -100,7 +103,7 @@ internal void AddMenuItemCut_Click(object sender, EventArgs e) } internal void AddMenuItemDelete_Click(object sender, EventArgs e) { - string msg = String.Format(WrapperResources.DeleteObjectWarning, this.Text, this.ToolTipText); + string msg = string.Format(WrapperResources.DeleteObjectWarning, this.Text, this.ToolTipText); if (MessageBoxHandling.Show ( msg, @@ -139,7 +142,7 @@ internal void AddMenuItemAdd_Click(object sender, EventArgs e) /// /// The instance that will be used as a wrapper to provide user interface. public WrapperTreeNode(object wrapper) - : this(wrapper, String.Empty) + : this(wrapper, string.Empty) { } internal WrapperTreeNode(object wrapper, string nodeName) : base(nodeName) { @@ -197,7 +200,7 @@ public virtual Dictionary> GetFolders /// /// The name represented as an instance of the . /// - public string Name { get { return Text; } } + public string Name => Text; /// /// Gets the error list. /// @@ -207,10 +210,7 @@ public virtual Dictionary> GetFolders /// Gets an editor that wraps the node in the property grid user interface. /// /// The wrapper. - public object Wrapper4PropertyGrid - { - get { return Wrapper; } - } + public object Wrapper4PropertyGrid => Wrapper; /// /// An instance of the interface that provides the description of the node to be /// bind with an external data source. @@ -227,25 +227,13 @@ public virtual INodeDescriptor GetINodeDescriptor() /// /// true if the is read-only; otherwise, false. /// - public bool IsReadOnly - { - get - { - return TestIfReadOnlyAndRetrunTrueIfReadOnly(); - } - } + public bool IsReadOnly => TestIfReadOnlyAndRetrunTrueIfReadOnly(); /// /// Gets the symbolic name. /// /// The symbolic name. - public virtual XmlQualifiedName SymbolicName - { - get - { - return new XmlQualifiedName(); - } - } - internal protected IMessageBoxHandling MessageBoxHandling { protected get; set; } + public virtual XmlQualifiedName SymbolicName => new XmlQualifiedName(); + protected internal IMessageBoxHandling MessageBoxHandling { protected get; set; } #endregion #region public @@ -287,10 +275,7 @@ internal WrapperTreeNodeImodelNodeEnumerator(WrapperTreeNode selectedWrapperTree } #region IEnumerator Members - IModelNodeAdvance IEnumerator.Current - { - get { return myIEnumerator.Current as IModelNodeAdvance; } - } + IModelNodeAdvance IEnumerator.Current => myIEnumerator.Current as IModelNodeAdvance; #endregion @@ -304,10 +289,7 @@ void IDisposable.Dispose() #region IEnumerator Members - object System.Collections.IEnumerator.Current - { - get { return myIEnumerator.Current; } - } + object System.Collections.IEnumerator.Current => myIEnumerator.Current; bool System.Collections.IEnumerator.MoveNext() { @@ -329,5 +311,6 @@ System.Collections.IEnumerator System.Collections.IEnumerable.GetEnumerator() return GetEnumerator(); } #endregion + } } diff --git a/ModelDesigner.DesignStudio/Wrappers4ProperyGrid/DocumentationAttribute.cs b/ModelDesigner.DesignStudio/Wrappers4ProperyGrid/DocumentationAttribute.cs index 2bb2b0a6..becdbed8 100644 --- a/ModelDesigner.DesignStudio/Wrappers4ProperyGrid/DocumentationAttribute.cs +++ b/ModelDesigner.DesignStudio/Wrappers4ProperyGrid/DocumentationAttribute.cs @@ -1,23 +1,15 @@ -// -// Title : Documentation attribute for exporting tool -// System : Microsoft Visual C# .NET 2008 -// $LastChangedDate$ -// $Rev$ -// $LastChangedBy$ -// $URL$ -// $Id$ +//___________________________________________________________________________________ // -// Copyright (C)2009, CAS LODZ POLAND. -// TEL: +48 (42) 686 25 47 -// mailto://techsupp@cas.eu -// http://www.cas.eu -// +// Copyright (C) 2020, Mariusz Postol LODZ POLAND. +// +// To be in touch join the community at GITTER: https://gitter.im/mpostol/OPC-UA-OOI +//___________________________________________________________________________________ -using CAS.Lib.ControlLibrary; using CAS.UA.Model.Designer.Wrappers4ProperyGrid.Editors; using Opc.Ua.ModelCompiler; using System; using System.Xml; +using UAOOI.Windows.Forms; namespace CAS.UA.Model.Designer.Wrappers4ProperyGrid { @@ -49,7 +41,6 @@ public DocumentationAttribute(string name, Type ConverterToDocumentationString, this.DefaultValue = defaultValue; } } - public class GetterOfNameAsString : IConverterToDocumentationString { #region IConverterToDocumentationString Members diff --git a/ModelDesigner.DesignStudio/Wrappers4ProperyGrid/Editors/XmlQualifiedNameEditorWithDefaultValue.cs b/ModelDesigner.DesignStudio/Wrappers4ProperyGrid/Editors/XmlQualifiedNameEditorWithDefaultValue.cs index 96375763..eb421064 100644 --- a/ModelDesigner.DesignStudio/Wrappers4ProperyGrid/Editors/XmlQualifiedNameEditorWithDefaultValue.cs +++ b/ModelDesigner.DesignStudio/Wrappers4ProperyGrid/Editors/XmlQualifiedNameEditorWithDefaultValue.cs @@ -1,28 +1,21 @@ -// -// Title : Editor of the XmlQualifiedName that allows to define a default value. -// System : Microsoft Visual C# .NET 2008 -// $LastChangedDate$ -// $Rev$ -// $LastChangedBy$ -// $URL$ -// $Id$ +//___________________________________________________________________________________ // -// Copyright (C)2009, CAS LODZ POLAND. -// TEL: +48 (42) 686 25 47 -// mailto://techsupp@cas.eu -// http://www.cas.eu -// +// Copyright (C) 2020, Mariusz Postol LODZ POLAND. +// +// To be in touch join the community at GITTER: https://gitter.im/mpostol/OPC-UA-OOI +//___________________________________________________________________________________ + using System.ComponentModel; using System.Xml; -using CAS.Lib.ControlLibrary; +using UAOOI.Windows.Forms; namespace CAS.UA.Model.Designer.Wrappers4ProperyGrid.Editors { /// /// Editor of the that handles default values. /// - public class XmlQualifiedNameEditorWithDefaultValue: XmlQualifiedNameEditor + public class XmlQualifiedNameEditorWithDefaultValue : XmlQualifiedNameEditor { #region private @@ -35,16 +28,13 @@ public class XmlQualifiedNameEditorWithDefaultValue: XmlQualifiedNameEditor /// /// The default value. [ - DisplayName( "Default value" ), - BrowsableAttribute( true ), - DescriptionAttribute( "The default value" ), - NotifyParentPropertyAttribute( true ), - ReadOnlyAttribute( true ) + DisplayName("Default value"), + BrowsableAttribute(true), + DescriptionAttribute("The default value"), + NotifyParentPropertyAttribute(true), + ReadOnlyAttribute(true) ] - public string DefaultValue - { - get { return m_defaultValue.ToString(); } - } + public string DefaultValue => m_defaultValue.ToString(); #endregion public properties #region constructors @@ -54,8 +44,8 @@ public string DefaultValue /// The value. /// The namespace provider. /// The default value. - internal XmlQualifiedNameEditorWithDefaultValue( XmlQualifiedName value, IXmlQualifiedNameEditorNamespaceProvider namespaceProvider, XmlQualifiedName defaultValue ) - : base( value, namespaceProvider ) + internal XmlQualifiedNameEditorWithDefaultValue(XmlQualifiedName value, IXmlQualifiedNameEditorNamespaceProvider namespaceProvider, XmlQualifiedName defaultValue) + : base(value, namespaceProvider) { m_defaultValue = defaultValue; } @@ -66,12 +56,13 @@ internal XmlQualifiedName ValueOrDefault { get { - if ( IsEmpty ) + if (IsEmpty) return m_defaultValue; else return base.XmlQualifiedName; } } #endregion public + } } diff --git a/ModelDesigner.DesignStudio/Wrappers4ProperyGrid/NodeDesign.cs b/ModelDesigner.DesignStudio/Wrappers4ProperyGrid/NodeDesign.cs index 5beebb1b..0a6e840d 100644 --- a/ModelDesigner.DesignStudio/Wrappers4ProperyGrid/NodeDesign.cs +++ b/ModelDesigner.DesignStudio/Wrappers4ProperyGrid/NodeDesign.cs @@ -1,19 +1,10 @@ -// -// Title : ModelDesign : Nodes - functionality -// System : Microsoft Visual C# .NET 2008 -// $LastChangedDate$ -// $Rev$ -// $LastChangedBy$ -// $URL$ -// $Id$ +//___________________________________________________________________________________ // -// Copyright (C)2008, CAS LODZ POLAND. -// TEL: +48 (42) 686 25 47 -// mailto://techsupp@cas.eu -// http://www.cas.eu -// +// Copyright (C) 2020, Mariusz Postol LODZ POLAND. +// +// To be in touch join the community at GITTER: https://gitter.im/mpostol/OPC-UA-OOI +//___________________________________________________________________________________ -using CAS.Lib.ControlLibrary; using CAS.UA.IServerConfiguration; using CAS.UA.Model.Designer.Types; using CAS.UA.Model.Designer.Wrappers; @@ -21,6 +12,7 @@ using System; using System.Text; using System.Xml; +using UAOOI.Windows.Forms; namespace CAS.UA.Model.Designer.Wrappers4ProperyGrid { @@ -148,7 +140,7 @@ protected override void UpdateModelNode(T node) private void Import(XmlQualifiedNameEditor parent) { // check for missing name. - if (SymbolicId.IsNull && SymbolicName.IsNull && String.IsNullOrEmpty(BrowseName)) + if (SymbolicId.IsNull && SymbolicName.IsNull && string.IsNullOrEmpty(BrowseName)) BrowseName = "BrowseName" + System.Guid.NewGuid().ToString(); // use the browse name to assign a name. if (SymbolicName.IsNull) @@ -157,12 +149,12 @@ private void Import(XmlQualifiedNameEditor parent) StringBuilder name = new StringBuilder(); for (int ii = 0; ii < BrowseName.Length; ii++) { - if (Char.IsWhiteSpace(BrowseName[ii])) + if (char.IsWhiteSpace(BrowseName[ii])) { name.Append('_'); continue; } - if (Char.IsLetterOrDigit(BrowseName[ii]) || BrowseName[ii] == '_') + if (char.IsLetterOrDigit(BrowseName[ii]) || BrowseName[ii] == '_') name.Append(BrowseName[ii]); } // create the symbolic name. @@ -173,7 +165,7 @@ private void Import(XmlQualifiedNameEditor parent) { string id = SymbolicName.Name; if (parent != null) - id = String.Format("{0}_{1}", parent.Name, id); + id = string.Format("{0}_{1}", parent.Name, id); SymbolicId = new XmlQualifiedNameEditor(id, SymbolicName.NameSpace, this); } } @@ -363,8 +355,8 @@ protected override void CopyPropertyValuesFrom(IInstanceDesign source) } internal override IParent Parent { - get { return base.Parent; } - set { base.Parent = value; } + get => base.Parent; + set => base.Parent = value; } public INodeDescriptor GetINodeDescriptor(InstanceIdentifier uniqueNodeIdentifier, NodeClassesEnum nodeClasses) { @@ -375,10 +367,7 @@ public INodeDescriptor GetINodeDescriptor(InstanceIdentifier uniqueNodeIdentifie BindingDescription = this.Description.Value }; } - internal bool IsMandatory - { - get { return !ModellingRule.HasValue || (ModellingRule.Value == Opc.Ua.ModelCompiler.ModellingRule.Mandatory); } - } + internal bool IsMandatory => !ModellingRule.HasValue || (ModellingRule.Value == Opc.Ua.ModelCompiler.ModellingRule.Mandatory); #endregion #region private @@ -404,7 +393,7 @@ protected override void UpdateModelNode(T node) /// Gets the data type of the node if applicable, otherwise null. /// /// Data type of the variable, null for other node classes - protected virtual XmlQualifiedName GetDataType { get { return null; } } + protected virtual XmlQualifiedName GetDataType => null; /// /// Base implementation of the INodeDescriptor /// @@ -518,10 +507,7 @@ protected override void UpdateModelNode(Opc.Ua.ModelCompiler.MethodDesign node) /// Gets the default type definition. /// /// - protected override XmlQualifiedName GetDefaultTypeDefinition - { - get { return new XmlQualifiedName(); } - } + protected override XmlQualifiedName GetDefaultTypeDefinition => new XmlQualifiedName(); } #endregion #region class TypeDesign @@ -625,10 +611,7 @@ protected override void UpdateModelNode(T node) /// Gets the default type definition. /// /// - protected override XmlQualifiedName GetDefaultTypeDefinition - { - get { return BuildInXmlQualifiedNames.BaseObjectType; } - } + protected override XmlQualifiedName GetDefaultTypeDefinition => BuildInXmlQualifiedNames.BaseObjectType; } #endregion #region class ReferenceTypeDesign @@ -954,20 +937,14 @@ protected override void UpdateModelNode(T node) node.Historizing = this.Historizing.GetValueOrDefault(); node.HistorizingSpecified = this.Historizing.HasValue; } - protected override XmlQualifiedName GetDataType - { - get { return this.DataType.XmlQualifiedName; } - } + protected override XmlQualifiedName GetDataType => this.DataType.XmlQualifiedName; #endregion /// /// Gets the default type definition. /// /// - protected override XmlQualifiedName GetDefaultTypeDefinition - { - get { return BuildInXmlQualifiedNames.BaseVariableType; } - } + protected override XmlQualifiedName GetDefaultTypeDefinition => BuildInXmlQualifiedNames.BaseVariableType; } #endregion #region class DictionaryDesign @@ -1045,10 +1022,7 @@ protected override void UpdateModelNode(Opc.Ua.ModelCompiler.PropertyDesign node /// Gets the default type definition. /// /// - protected override XmlQualifiedName GetDefaultTypeDefinition - { - get { return BuildInXmlQualifiedNames.PropertyType; } - } + protected override XmlQualifiedName GetDefaultTypeDefinition => BuildInXmlQualifiedNames.PropertyType; } #endregion } diff --git a/ModelDesigner.DesignStudio/Wrappers4ProperyGrid/Nodes.Properties.cs b/ModelDesigner.DesignStudio/Wrappers4ProperyGrid/Nodes.Properties.cs index 1f02cce4..6fbf1195 100644 --- a/ModelDesigner.DesignStudio/Wrappers4ProperyGrid/Nodes.Properties.cs +++ b/ModelDesigner.DesignStudio/Wrappers4ProperyGrid/Nodes.Properties.cs @@ -1,25 +1,17 @@ -// -// Title : ModelDesign : Nodes.Properties -// System : Microsoft Visual C# .NET 2008 -// $LastChangedDate$ -// $Rev$ -// $LastChangedBy$ -// $URL$ -// $Id$ +//___________________________________________________________________________________ // -// Copyright (C)2008, CAS LODZ POLAND. -// TEL: +48 (42) 686 25 47 -// mailto://techsupp@cas.eu -// http://www.cas.eu -// +// Copyright (C) 2020, Mariusz Postol LODZ POLAND. +// +// To be in touch join the community at GITTER: https://gitter.im/mpostol/OPC-UA-OOI +//___________________________________________________________________________________ -using CAS.Lib.ControlLibrary; using CAS.UA.IServerConfiguration; using CAS.UA.Model.Designer.Wrappers; using CAS.UA.Model.Designer.Wrappers4ProperyGrid.Editors; using System; using System.ComponentModel; using System.Xml; +using UAOOI.Windows.Forms; namespace CAS.UA.Model.Designer.Wrappers4ProperyGrid { diff --git a/ModelDesigner.DesignStudio/app.config b/ModelDesigner.DesignStudio/app.config index ae486e55..e3b93579 100644 --- a/ModelDesigner.DesignStudio/app.config +++ b/ModelDesigner.DesignStudio/app.config @@ -1,15 +1,15 @@ - + -
+
-
+
- + @@ -102,131 +102,131 @@ - - - - + + + + - - - - + + + + - - - - + + + + - - - - + + + + - - - - + + + + - - - - + + + + - - - - + + + + - - - - + + + + - - - - + + + + - - - - + + + + - - - - + + + + - - - - + + + + - + - + - + - + - - + + diff --git a/ModelDesigner.DesignStudio/packages.config b/ModelDesigner.DesignStudio/packages.config index fc4f4761..9a68c941 100644 --- a/ModelDesigner.DesignStudio/packages.config +++ b/ModelDesigner.DesignStudio/packages.config @@ -1,10 +1,10 @@  - - - - + + + + @@ -12,9 +12,10 @@ - + - + + \ No newline at end of file