Objecteering Multi-user commands

Overview

The following commands are specific to the Objecteering Multi-user MDAC.

The ... command	is used to …
Get information	list new elements, reserved or not yet reserved in the project, with regard to the repository.
Properties	display an element's properties.
Diff-Merge models	compare or merge the current model with another stored model.

The "Get information" command

The "Get information" command allows you to obtain a report on the state of elements with regard to the repository. Elements are grouped according to the following states (an example is shown in Figure 41):

· Elements checked-out by me: elements which are checked-out by the current user

· Elements checked-out by other users: elements which are checked-out by another user

· New elements in the project: newly created elements or elements which have not yet been checked-in in the repository

· Elements deleted from the repository: elements which are present in the model but deleted from the repository by another user

· New elements in the repository: elements which have been created by another user and which are not in the project

If the "Confirm operations" parameter is activated in the "General settings" parameter set, a confirmation window appears, listing all elements to be searched for. The default values which appear are the values defined in the "Search" parameter set.

Figure 41. Confirmation of the "Get information" command used to parameterize the search

Note: If the "Memorize search parameters" tickbox is checked, the values defined are retained for the next search. This modifies the parameters in the "Search" parameter set.

Figure 42. Example of elements grouped according to their state

Information is presented in the form of a browser, which means that elements can be expanded or reduced by clicking on the associated +/- sign. For all states, except "New elements in the repository", elements can be double-clicked. This double-click operation allows the elements to be selected in the explorer. If elements have not been found in a group, then the "no elements" message appears for that group.

This command is always carried out in hierarchical mode, so as to handle all the components of the current element. When this command is run on the project, all information on all project elements is obtained.

When the window is opened, all information is written in the output window. This means that it is possible to save this information by saving the contents of the output window.

The "Properties" command

For the Objecteering Multi-user MDAC, the information displayed is as follows:

· The location of the repository

· The name of the file corresponding to the element

· The version of the element present in the Objecteering model

· The version of the element present in the repository

· The state of the element (checked-in, checked-out, new, deleted)

Figure 43. The properties of an element with the Objecteering Multi-user MDAC

The "Diff-Merge models" command

The "Diff-Merge models" command is used to select the model you wish to compare, to select the ancestor model and to customize the options used by the Diff-Merge tool.

The model to be compared and the ancestor model can be retrieved in:

· another project

· a repository managed by Objecteering Multi-user, a ClearCase view or a simple directory containing a model in a form equivalent to that of the model in the repository.

Note: Before carrying out a model merge, you must check-out those elements which are going to modified by the merge. If you are running a comparison without a subsequent merge, this is not necessary.

This information is defined through a wizard containing three windows. The first window (shown in Figure 44 below) is used to select the model which is to be compared. Two choices are possible:

· Select Objecteering project: by selecting this option, the list which follows this option contains all the projects available on the Objecteering site.

· Select repository: by selecting this option, you can define the directory where the elements which are to be compared are stored.

Figure 44. Selecting the model to be compared

To continue with the next step, you must either select an Objecteering project from the list, or define a directory in which the element which is to be compared can be accessed. By default, the "Select repository" button is checked and the path to the Multi-user repository defined in the field below.

After selecting your project or directory, click on the "Next" button to continue with the second step.

The second window (shown in Figure 45 below) is used to select the ancestor model. This second window behaves in the same way as the first.

Figure 45. Selecting the ancestor model

The selection of the ancestor model is optional. In order not to define an ancestor model, no Objecteering model should be selected if the "Select Objecteering project" tickbox has been checked, and the "Repository" field must be blank if the "Select repository" tickbox has been checked.

To continue with the final step, simply click on the "Next" button.

The third window (shown in Figure 46) is used to define Diff-Merge customization options.

Figure 46. Configuring the Diff-Merge

All these parameters are initialized when this wizard is opened, using the values defined for the "Diff-Merge" parameter set at MDAC parameter level.

The ... parameter	is used to ...
Log	indicate the log where information on all the modifications carried out by the Diff-Merge editor is stored. Environment variables in $(OBJING_PATH) form can be used in this field to define the location of the log file.
External editor for merging texts	indicate the external editor used to merge all note types (C++, Java, documentation, etc). Environment variables in $(OBJING_PATH) form can be used in this field to define the location of the external editor of your choice.
Options and arguments for merge editor	define the options and arguments of the editor used for the Diff-Merge of texts. According to the editor used, options and arguments can be different. Two variables must be used to represent the initial text and the text which is to be compared. $(LEFTFILE) represents the initial text, whilst $(RIGHTFILE) represents the text which is to be compared. Unlike MDAC parameters, you must not put two $ signs.
Merge result	define the file containing the result of the text merge. According to the editor used, the editor value can be different. For example, if the editor saves the result of the merge in the initial text, the $(LEFTFILE) value must be given to this parameter.

To activate the comparison between the current model and the model to be compared, simply click on the "Finish" button.

For more information on the Diff-Merge tool, please see "The Diff-Merge tool".