Namespace: Consultingwerk.Windows.Framework.Repository.MergeUtil
Class 
ObjectMasterMergeControl Copy to Clipboard
Parent classes:
Progress.Windows.UserControl
Consultingwerk.SmartComponents.Base.SmartUserControl
Consultingwerk.Windows.Framework.Repository.MergeUtil.ObjectMasterMergeControl

Inherits: Consultingwerk.SmartComponents.Base.SmartUserControl
Implements: IHasDesignerVerbs

/*&GLOBAL-DEFINE NoUserLobStatistics NoUserLobStatistics

Navigate to: Methods | Constructors | Events | Properties | ProDatasets | Temp-Tables



Top Method Summary
Options Name Purpose
INTEGER ApplyIncomingChanges () Applies the changes that were made only on the incoming side (the file on disk) to the Merged tree
INTEGER ApplyIncomingChanges (character, integer, logical) Applies the incoming changes of one node type to the Merged tree
ArrangeControls () Arranges the tree controls and labels in columns
ClassifyNodes () Classifies the nodes of the three versions of a three-way merge
CollectNodes (ObjectMasterTreeControl) Collects the nodes of a tree control into the ttMergeNode temp-table
CopyIncoming () Copies the selected node from the incoming dataset
CopyOwn () Copies the selected node from the own dataset
INTEGER CountConflicts () Returns the number of conflicts of the three-way merge
CHARACTER FormatCommitDetails (GitCommitInfo) Returns the text describing a Git commit for the label above a tree
CHARACTER FormatFileStatus (GitFileStatus) Returns the text describing the Git status of the .smartrepo file on disk for the label above the Incoming tree
LOGICAL HasOwnChangesBelow (character) Returns if a node of the SmartDB version has child nodes that were changed in the SmartDB or that are in conflict
InitializeComponent () Initializes the Visual Design
LOGICAL IsMergeUnit (character) Returns if a node can be copied or removed by the merge
NodeCollapsedHandler (Object, NodeEventArgs) Event handler for the NodeCollapsed event of the tree controls
NodeExpandedHandler (Object, NodeEventArgs) Event handler for the NodeExpanded event of the tree controls
NodeSelectedHandler (Object, SelectEventArgs) EVent handler for the NodeSelectedHandler event of the three tree controls
ObjectMasterMergeControl_Resize (Object, EventArgs) Event handler for the Resize Event
OpenIncomingFile (character) Opens the smartrepo file in the incoming tree view
OpenMerge (character, character) Starts a merge session by loading a .smartrepo file and an object master from the repository
OpenRepositoryObject (character) Opens the existing repository object
OpenSmartRepoFile (ObjectMasterTreeControl, character) Opens a .smartrepo file in a tree view
RemoveNode () Removes a Node from the Merged Tree
SaveChanges () Saves the changes to the repository object
SetLabels (character, character) Sets the Labels
SetNodeStates (ObjectMasterTreeControl) Sets the three-way merge state colors of a tree control
TreeUpdatedHandler (Object, EventArgs) Event handler for the TreeUpdated event of the tree view with the merged result
UpdateNodeColors () Updates the node colors of all tree controls

Top Constructor Summary
Options Name Purpose
ObjectMasterMergeControl () Constructor for the ObjectMasterMergeControl class

Top Property Summary
Options Name Purpose
LOGICAL IsThreeWayMerge


Method Detail
Top

INTEGER ApplyIncomingChanges ()
Purpose: Applies the changes that were made only on the incoming side
(the file on disk) to the Merged tree
Notes: SCL-6025: The node types are processed in an order that keeps
the references intact: pages and object instances are added
before the links that reference them, links and attributes are
removed before the instances and pages they belong to. A change
that cannot be applied is turned into a conflict

Returns INTEGER
The number of changes applied
Top

INTEGER ApplyIncomingChanges (character, integer, logical)
Purpose: Applies the incoming changes of one node type to the Merged tree
Notes: SCL-6025

Parameters:
pcGroup CHARACTER
The name of the group node (Fields, Attributes, Instances, Pages, Links)
piLevel INTEGER
The level of the nodes, 4 for the nodes of the object master, 6 for the nodes of an object instance
plCopy LOGICAL
True to copy added or changed nodes, false to remove deleted nodes
Returns INTEGER
The number of changes applied
Top

ArrangeControls ()
Purpose: Arranges the tree controls and labels in columns
Notes: SCL-6025: Four columns (Base, Incoming, Merged, Own) for a
three-way merge, three columns otherwise. For a three-way merge
the Git commit details are shown above the Base and the
Incoming tree

Top

ClassifyNodes ()
Purpose: Classifies the nodes of the three versions of a three-way merge
Notes: SCL-6025: Only the nodes that can be copied or removed are
classified - the fields, attributes, object instances, pages
and links of the object master and the fields and attributes
of the object instances

Top

CollectNodes (ObjectMasterTreeControl)
Purpose: Collects the nodes of a tree control into the ttMergeNode
temp-table
Notes: SCL-6025

Parameters:
poTree Consultingwerk.Windows.Framework.Repository.MergeUtil.ObjectMasterTreeControl
The reference to the ObjectMasterTreeControl (Base, Incoming or Own)
Top

CopyIncoming ()
Purpose: Copies the selected node from the incoming dataset
Notes:

Top

CopyOwn ()
Purpose: Copies the selected node from the own dataset
Notes:

Top

INTEGER CountConflicts ()
Purpose: Returns the number of conflicts of the three-way merge
Notes: SCL-6025

Returns INTEGER
The number of conflicts
Top

CHARACTER FormatCommitDetails (GitCommitInfo)
Purpose: Returns the text describing a Git commit for the label above a
tree
Notes: SCL-6025: Two lines - short commit ID, date and author, then
the subject of the commit message

Parameters:
poCommit Consultingwerk.Studio.Git.GitCommitInfo
The GitCommitInfo instance, ? when the file was never committed
Returns CHARACTER
The text for the label
Top

CHARACTER FormatFileStatus (GitFileStatus)
Purpose: Returns the text describing the Git status of the .smartrepo
file on disk for the label above the Incoming tree
Notes: SCL-6025: The commit that last changed the file in the current
branch, followed by a line telling if the file on disk is
identical to that version, modified or staged

Parameters:
poStatus Consultingwerk.Studio.Git.GitFileStatus
The GitFileStatus instance
Returns CHARACTER
The text for the label
Top

LOGICAL HasOwnChangesBelow (character)
Purpose: Returns if a node of the SmartDB version has child nodes that
were changed in the SmartDB or that are in conflict
Notes: SCL-6025: An object instance that was deleted in the file is
only removed when it was not changed in the SmartDB

Parameters:
pcKey CHARACTER
The key of the node
Returns LOGICAL
Logical value indicating if a child node was changed in the SmartDB
Top

InitializeComponent ()
Purpose: Initializes the Visual Design
Notes:

Top

LOGICAL IsMergeUnit (character)
Purpose: Returns if a node can be copied or removed by the merge
Notes: SCL-6025: The fields, attributes, object instances, pages and
links of the object master (level 4) and the fields and
attributes of an object instance (level 6). The root node and
the group nodes are not classified

Parameters:
pcKey CHARACTER
The key of the node
Returns LOGICAL
Logical value indicating if the node can be copied or removed
Top

NodeCollapsedHandler (Object, NodeEventArgs)
Purpose: Event handler for the NodeCollapsed event of the tree controls
Notes:

Parameters:
sender System.Object
The reference to the Control that raised the event
e Infragistics.Win.UltraWinTree.NodeEventArgs
The NodeEventArgs with the data for this event
Top

NodeExpandedHandler (Object, NodeEventArgs)
Purpose: Event handler for the NodeExpanded event of the tree controls
Notes:

Parameters:
sender System.Object
The reference to the Control that raised the event
e Infragistics.Win.UltraWinTree.NodeEventArgs
The NodeEventArgs with the data for this event
Top

NodeSelectedHandler (Object, SelectEventArgs)
Purpose: EVent handler for the NodeSelectedHandler event of the three tree controls
Notes:

Parameters:
sender System.Object
: System.Object
e Infragistics.Win.UltraWinTree.SelectEventArgs
: Infragistics.Win.UltraWinTree.SelectEventArgs
Top

ObjectMasterMergeControl_Resize (Object, EventArgs)
Purpose: Event handler for the Resize Event
Notes:

Parameters:
sender System.Object
The reference to the control that raised the event
e System.EventArgs
The System.EventArgs with the data for this event
Top

OpenIncomingFile (character)
Purpose: Opens the smartrepo file in the incoming tree view
Notes:

Parameters:
pcFilename CHARACTER
The name of the .smartrepo file to load
Top

OpenMerge (character, character)
Purpose: Starts a merge session by loading a .smartrepo file and an
object master from the repository
Notes: SCL-6025: A three-way merge when the base version of the file
can be read from the Git repository (the file is part of a Git
working tree and the current branch is a feature branch), a
two-way merge otherwise

Parameters:
pcFileName CHARACTER
The name of the .smartrepo file to load
pcObjectMasterGuid CHARACTER
The GUID of the repository object master
Top

OpenRepositoryObject (character)
Purpose: Opens the existing repository object
Notes:

Parameters:
pcObjectMasterGuid CHARACTER
The GUID of the repository object master
Top

OpenSmartRepoFile (ObjectMasterTreeControl, character)
Purpose: Opens a .smartrepo file in a tree view
Notes: SCL-6025: Used for the incoming file and the base version

Parameters:
poTree Consultingwerk.Windows.Framework.Repository.MergeUtil.ObjectMasterTreeControl
The reference to the ObjectMasterTreeControl to load the file into
pcFileName CHARACTER
The name of the .smartrepo file to load
Top

RemoveNode ()
Purpose: Removes a Node from the Merged Tree
Notes:

Top

SaveChanges ()
Purpose: Saves the changes to the repository object
Notes:

Top

SetLabels (character, character)
Purpose: Sets the Labels
Notes:

Parameters:
pcObjectMasterName CHARACTER
The name of the object master
pcFileName CHARACTER
The name of the file
Top

SetNodeStates (ObjectMasterTreeControl)
Purpose: Sets the three-way merge state colors of a tree control
Notes: SCL-6025

Parameters:
poTree Consultingwerk.Windows.Framework.Repository.MergeUtil.ObjectMasterTreeControl
The reference to the ObjectMasterTreeControl
Top

TreeUpdatedHandler (Object, EventArgs)
Purpose: Event handler for the TreeUpdated event of the tree view with the merged result
Notes:

Parameters:
sender System.Object
The reference to the control that raised the event
e System.EventArgs
The System.EventArgs with the data for this event
Top

UpdateNodeColors ()
Purpose: Updates the node colors of all tree controls
Notes: Bold nodes differ from the Merged tree (the Merged tree: from
the Incoming tree). SCL-6025: For a three-way merge the colors
tell where a difference was introduced



Constructor Detail
Top

ObjectMasterMergeControl ()
Purpose: Constructor for the ObjectMasterMergeControl class
Notes:



Property Detail
Top

LOGICAL IsThreeWayMerge

Returns LOGICAL


©2006-2026 Consultingwerk Ltd.         info@consultingwerk.de         http://www.consultingwerk.de       09.11.2026 08:18:53