Добавил:
Опубликованный материал нарушает ваши авторские права? Сообщите нам.
Вуз: Предмет: Файл:
Скачиваний:
36
Добавлен:
16.04.2013
Размер:
3.34 Mб
Скачать

 

 

&KDSWHU &RPSDULQJ DQG 0HUJLQJ 0RGHOV

 

 

 

 

Only identical objects

 

Only selected objects

 

Show only conflicts

 

Hide all preservations

Understanding

When you are performing a generation or a consolidation, you can use the

conflicts

"Show Only conflicts" filter.

 

This filter displays conflicts between models with common origin such as

 

local model and consolidated model or origin model and generated model.

 

A merge conflict occurs when corresponding objects have been modified in

 

both the origin and generated model or the local and Repository model. Such

 

modifications can be a change in object properties, a change in a list of

 

objects, a change in the order of a list or the deletion of an object.

 

For more information on defining a merge filter, see the section

 

Defining a comparison filter.

Understanding

When you are performing an intermodel generation, you can use the "Hide

preservations

All Preservations" filter.

This filter hides all differences associated with changes made in the model to be merged as well as all identical objects in order to show only changes made in the model on the left since last generation.

1DYLJDWLQJ DPRQJ PHUJH DFWLRQV

You can navigate among the proposed merge actions displayed in the model to be merged using the following tools:

7RRO 'HVFULSWLRQ

Goes to the first difference in the tree view

Goes to the previous difference in the tree view

Goes to the next difference in the tree view

Goes to the last difference in the tree view

General Features Guide

 

0HUJLQJ PRGHOV

&RQWH[WXDO PHQX

You can right-click a moved object and select Next or Previous occurrence to go to its next or previous occurrence.

+RW NH\V IRU H[SDQGLQJ DQG FROODSVLQJ DOO QRGHV DW RQFH

To expand all nodes at once, you can press the numpad star (*).

To collapse all nodes at once, you can press the numpad minus sign (-).

$QDO\]LQJ PHUJH DFWLRQV

For each difference detected during the comparison process, a merge action is proposed for you to synchronize the model to be merged with the model on the left pane. In the model to be merged, when a merge action is proposed for an object in the tree view, a check box appears beside the object. The type of merge action is displayed under the form of an icon in the bottom right corner of the object.

8QGHUVWDQGLQJ PHUJH LFRQV

Merge icons are composed of a symbol and a colour. Each of them has a specific meaning.

Merge symbols

The following table explains symbol code:

 

6\PERO

 

'HVFULSWLRQ

 

$SSHDU«

 

 

 

 

Triangle

 

Indication

 

In models on right and left panes

 

Circle + check box

 

Merge action

 

In model on right pane

 

 

 

 

 

 

 

 

 

Merge colors

The following table explains color code:

 

&RORU

 

'HVFULSWLRQ

 

 

 

Red

 

Modification

 

Yellow

 

Indication

 

 

 

Green

 

Move

 

 

 

Purple

 

Deletion and shortcut replacement

 

 

 

Blue

 

Addition

 

 

 

 

 

PowerDesigner

 

 

&KDSWHU &RPSDULQJ DQG 0HUJLQJ 0RGHOV

Indication icons (the triangle icons) appear in models on right and left panes.

Theses icons are used to indicate the following:

,FRQ 'HVFULSWLRQ

Children were modified

(yellow)

Object properties were modified

(red)

Object was moved

(green)

8QGHUVWDQGLQJ PHUJH DFWLRQV

The following table summarizes the merge actions suggested for each type of difference existing between the models:

'LIIHUHQFH

 

0HUJH DFWLRQ

 

Object creation

 

Adds object to model to be merged

 

 

 

because it exists in model on left

 

 

 

pane

 

Object deletion

 

Deletes object from model to be

 

 

 

 

 

merged

 

Object

 

Updates object definition in model

 

 

 

modification

 

to be merged using object

 

 

 

definition in model on left pane

 

Object move

 

Moves object in model to be

 

 

 

 

 

merged to the same location as in

 

 

 

model on left pane or replaces it

 

 

 

with shortcut

 

Shortcut merge

 

Replaces the shortcut with target

 

 

 

 

 

object

 

Shortcut deletion

 

Deletes shortcut from target model

 

 

 

,FRQ

(blue)

(purple)

(red)

(green)

(purple)

(purple)

General Features Guide

 

0HUJLQJ PRGHOV

Moving an object from a package to another

'LIIHUHQFH

0HUJH DFWLRQ

,FRQ

Shortcut creation

Creates shortcut in target model

 

 

 

(blue)

 

 

 

When you merge models in one of which you have moved an object from a package to another and modified its properties, the object appears in both packages of the model to be merged, in the object comparison part.

In the the following example, Entt_5 in Package 2 was modified and moved into Package 1:

,FRQ 'HVFULSWLRQ

One occurrence remains in the package on the left pane and the opposite icon is displayed at the bottom right corner of the object to indicate that the object properties were modified

The second occurrence appears grayed out in the package to be merged and the opposite icon is displayed at the bottom right corner of the object to indicate that the object was moved but does not yet exist in that location

You are invited to synchronize the models on the right and left panes by selecting both check boxes.

&KHFN ER[ V\QFKURQL]DWLRQ

When you select or clear a merge action check box for a moved object, the check box of the other occurrences are automatically selected or cleared.

PowerDesigner

&KDSWHU &RPSDULQJ DQG 0HUJLQJ 0RGHOV

When you move an object that is replaced with a shortcut, the merge action suggested is the move with no indication of shortcut replacement. The unique indication of the object replacement with a shortcut appears with the following icon in the model on the left pane of the Merge Models dialog box:

In the following example, Entt_2 in the main diagram was moved into

Package 2:

/HIW PRGHO

5LJKW PRGHO

'HVFULSWLRQ

Move target object

Replace target object with a shortcut

0RYH DQG QDPHVSDFH

When you merge models, move is not a suggested merge action for objects which are in different namespaces but have identical name. In that case creation or deletion of the object are proposed.

For more information on namespace in models, see section Managing the namespace in models in chapter Managing Models.

User permissions When a user does not have the appropriate rights and permissions in the

in the repository repository, merge actions appear with a grayed out check box and cannot be selected.

General Features Guide

 

0HUJLQJ PRGHOV

However, some actions can be applied to objects in packages on which the user does not have the required permission, in order to be consistent with a permitted action.

In the following example, the model on the left pane corresponds to the local model and the model on the right pane corresponds to the repository model. The user has a Read permission on Package 1 and a Write permission on Package 2.

0RGHO

3DFNDJH

:KDW KDSSHQV«

Local

Package 2 (Write

Entt_3 was deleted

model (left

permission)

 

pane)

 

 

 

Package 1 (Read

Entt_1 properties were modified

 

 

permission)

Entt_3 shortcut was deleted because of the

 

 

 

 

deletion of Entt_3 in Package 2

Repository

Package 2 (Write

The proposed merge action for Entt_3 is

model

permission)

delete. The user has a Write permission and

(right pane)

 

can select this action

 

Package 1 (Read

Entt_1 check box cannot be selected (grayed)

 

 

permission)

because the user does not have Write

 

 

permission

 

 

The check box for Entt_3 shortcut cannot be

 

 

selected (grayed) but the shortcut will be

 

 

deleted anyway to be consistent with the

 

 

merge action for Entt_3 selected in Package 2

 

 

 

For more information on user permission, see the 5HSRVLWRU\ 8VHU V *XLGH.

 

PowerDesigner

&KDSWHU &RPSDULQJ DQG 0HUJLQJ 0RGHOV

6HOHFWLQJ PHUJH DFWLRQV LQ WKH PRGHO WR EH PHUJHG

 

 

You can select merge action check boxes individually. By default, all

 

 

creation, modification and move actions are selected in the model to be

 

 

merged, deletion actions are not selected.

Exception

 

For consolidated models, the merge actions selected by default depends on

 

 

the latest modifications saved in the model.

 

 

For generated models, the merge actions selected by default depend on the

 

 

modifications saved in the model to be merged if the Preserve modification

 

 

check box in the Generation options dialog box was selected.

 

 

You can also accept all merge actions proposed, and use the shortcut

 

 

selection or deselection tools from the merge toolbar.

 

 

The following selection or deselection tools are available from the merge

 

 

toolbar:

 

 

 

 

7RRO

 

'HVFULSWLRQ

 

 

 

 

 

 

 

Selects all merge actions in the right model tree view or select:

 

 

 

 

Creation actions

 

 

 

 

Deletion actions

 

 

 

 

Modification actions

 

 

 

 

Move actions

 

 

 

 

Clears all merge actions in the right model tree view or clear:

 

 

 

 

 

 

 

 

Creation actions

 

 

 

 

Deletion actions

 

 

 

 

Modification actions

 

 

 

 

Move actions

 

ϖ 7R VHOHFW D PHUJH DFWLRQ LQ WKH PRGHO WR EH PHUJHG

 

 

Select the check box besides an object with a merge action icon.

 

 

RU

 

 

 

 

Use the multi selection tool from the merge toolbar to select all merge

 

 

actions in the model tree view.

6HOHFWLQJ SURSHUWLHV WR PHUJH

When objects have different definitions, you can select a merge action to synchronize their definitions. PowerDesigner lets you define exactly which property you want to merge in the object definition.

General Features Guide

 

0HUJLQJ PRGHOV

&RPSDULVRQ RI SURSHUW\ YDOXHV

You can double-click a property in the property comparison part to display differences between models.When a line is added the following symbol appears >>, when a line is deleted, the following symbol appears <<.

ϖ7R VHOHFW SURSHUWLHV WR PHUJH

1Select objects with different definitions in the object comparison part of the Merge window.

2Select or clear the check boxes corresponding to the properties you want to merge in the properties comparison part of the Merge window.

By default, the diverging properties are selected in the list:

6\QFKURQL]LQJ REMHFWV PDQXDOO\

When an object has been renamed or modified out of the PowerDesigner interface, the link with the corresponding object in the compared model is lost.

In such situation the comparison interface will display two disconnected objects in the model trees with object creation and deletion actions in each model.

The manual synchronization will let you rebuild equivalence between disconnected objects and refresh the object comparison part. This advanced feature supposes you are very familiar with the model contents.

 

PowerDesigner

&KDSWHU &RPSDULQJ DQG 0HUJLQJ 0RGHOV

'HILQLQJ REMHFWV WR V\QFKURQL]H

For manual synchronization, you have to define the following parameters:

3DUDPHWHU

'HVFULSWLRQ

From Parent

Model or package on the left pane used as reference. You can

 

select another model or package from the dropdown listbox

From Object

Object on the left pane used as reference for manual

 

synchronization, you can use the Properties tool to better

 

identify object

To Parent

Model or package on the right pane to be synchronized. You

 

can select another model or package from the dropdown listbox

To Object

Object on the right pane to be synchronized, you can use the

 

Properties tool to better identify object

 

 

Manual synchronization lets you perform the following operations:

Synchronize moved or disconnected objects. You can use the Parent box to select the parent package corresponding to the package on the left pane.

De-synchronize objects that share common properties and are naturally related in the comparison process. You can select <NONE> or another object from the Object dropdown listbox in order to break the relation between objects.

The tree view of the model to be merged is automatically updated after you validate a manual synchronization.

6\QFKURQL]DWLRQ UHVXOWV

When you synchronize objects and linking objects, you obtain the following result:

 

:LWKLQ WKH VDPH

2EMHFW

SDFNDJH

Object

Objects on the left pane and

Linking object

parent objects are

 

synchronized

 

 

%HWZHHQ GLIIHUHQW SDFNDJHV

Object moved to package to be merged and removed from package on the left pane

General Features Guide

 

0HUJLQJ PRGHOV

ϖ7R V\QFKURQL]H REMHFWV PDQXDOO\

1 Select the item you want to synchronize from one of the model trees. 2 Select the Manually Synchronize Two Objects tool.

The Manual Synchronization dialog box appears. According to the merge action proposed, the From or the To box is editable.

3Select a new package or model in the Parent dropdown listbox.

4Select the object that will become the reference for synchronization in the Object dropdown listbox.

5Click OK.

The selected items are synchronized and the tree view of the model to be merged is updated in order to show the impact of the manual synchronization.

3UHYLHZLQJ DQG SULQWLQJ PHUJH DFWLRQV

You can preview and print the selected merge actions from the Merge

Models dialog box.

The merge result depends on the filter options you have previously defined.

ϖ7R SUHYLHZ DQG SULQW PHUJH DFWLRQV

1Click the Merge Preview tool in the Merge Models dialog box.

The Merge Preview window appears. It displays the merge actions you have selected.

2Click the Print tool.

 

PowerDesigner

Тут вы можете оставить комментарий к выбранному абзацу или сообщить об ошибке.

Оставленные комментарии видны всем.

Соседние файлы в папке PowerDesigner 9