- Project Branching in teamwork. Project Branching
support in teamwork allows deriving one project version from another.
Versions may be duplicated and it enables parallel work on them.
Branching increases productivity for those who:
- use MDD tools (for example AndroMDA, openArchitectureWare
and other).
- produce different products that are still very interrelated.
This is common when several versions of the same product are
designated for different types of customers.
- have several development teams working on a single product
and have to merge several development branches before releasing the
product.
To create a new branch for the teamwork project:
- Select the Projects command from the Teamwork
menu. The Edit Project dialog box opens.
- Click the Versions button to invoke the Versions
dialog (see Figure 1).
- Select the project for which you want to create a branch.
- Click the Create Branch button. The Create
Branch dialog box opens (see Figure 2). Click OK. A branch for project is created.
For more information about project branching in teamwork, see
MagicDraw Teamwork UserGuide.pdf.
Figure 1 – The Versions dialog
Figure 2 – The Create Branch dialog
- Model Merge. Model Merge enables copying changes
between different project versions. This functionality is usually
needed when there are several branches that reflect different releases
or versions of the product, e.g. when certain fixes have to be copied
from a release branch to the mainstream development.
Merge functionality in MagicDraw works both on file system
files and projects stored in MagicDraw Teamwork server. The general
workflow for merging projects is as follows:
- To start merging select Project Merge from the Tools
main menu. The Merge Projects dialog opens (see Figure 3).
- Choose source project and target project (changes are going
to be copied from the source to the target project). Source and
target projects may be stored in file system or the Teamwork server.
If both projects are stored in the Teamwork server, the ancestor is
determined automatically.
- The Merge window appears which allows analyzing
changes made in both contributors and resolving conflicts occurred on
them (e.g. when the same class is edited in both contributors) (see Figure 4).
- After accepting and rejecting changes and resolving
conflicts, the user is asked to confirm changes, but made to the
target.
For more information about model merge, see the Model Merge
section in MagicDraw UserManual.pdf.
NOTE: Model Merge functionality is available in Standard Edition and above for an additional fee.
Figure 3 – The Merge Projects dialog
Figure 4 – The Merge window
- Methodology Wizards Plugin (technology preview) - Automates
modeling tasks and extends methodology support in MagicDraw. This
Wizard guides you through model creation process according to a set
methodology.
The samples included in this prototype automates the creation
steps of the following tasks:
- Creating a Use Case model;
- Creating a glossary;
- Creating multiple elements with a single click;
- Invoking other productivity related features directly from
the wizard (report generation, metrics, validation and others).
The Methodology Wizards engine consists of customizable model
based steps and can be adapted to fit your work processes.
To try the Methodology Wizards plugin, go to the Help menu and
select the Resource/Plugin Manager to see the
list of available plugins. Select the Methodology Wizards
Plugin to download and install.
For more information about Methodology Wizards plugin, see
MagicDraw MethodologyWizardsPlugin UserGuide.pdf.
NOTE: The Methodology Wizards plugin is in prototype stage, we encourage you to try it and give the feedback and suggestions to help us make this plugin better. We truly appreciate your time and effort to help is provided the best possible solutions.
Figure 5 –Methodology Wizard
- Provided and Required Interfaces in the Composite
Structure and other diagrams. Provided / Required Interfaces of Port
now can be displayed in the Composite Structure diagram (or SysML IBD
diagram) using lollipop/fork notation. Lollipop and fork symbols are
implemented as small adornments to Port symbol (like name label).
Choose Related Elements and then Display
Provided/Required Interfaces from the port shortcut menu to display
already defined provided/required interfaces on port. Interfaces could
be defined in specification dialog of Port or in Class diagram using
Usage and Interface Realization relationships.
For more information about Provided and Required Interfaces in
the Composite Structure diagram, see MagicDraw UserManual.pdf.
Figure 6 - Provided/Required Interfaces in the Composite
Structure diagram
- Active Validation. The Active Validation instantly
checks model for correctness and completeness, displays errors in the
model and suggests solutions. By default Active Validation is used in:
- Parameters and arguments synchronization validation;
- Shape ownership validation;
- Orphaned proxies' validation.
Active Validation is extendable mechanism providing common
problem indication and solving ways. Custom validation suites can be
created using binary or OCL constraints. Invalid symbols are marked on
diagrams and elements in model. You can create new suites in
Enterprise edition only. The predefined suites are available in all
MagicDraw editions.
Model elements that fail OCL validation are represented in the
following ways:
If invalid or incomplete model is created, at the left-bottom
corner of MagicDraw the failure indicator appears (see Figure 7).
Invalid elements are marked in Browser and Diagram (see Figure
8).
Validation results can be ignored, solved (using automatic
solvers) or analyzed in the Active Validation Results
window (see Figure 9). Clicking on the error or warning icon in the
status bar opens the Active Validation Results window.
For more information about Active Validation, see MagicDraw
UserManual.pdf.
NOTE: You can create new suites in Enterprise edition only. The
predefined suites are available in all MagicDraw editions.
Figure 7 – Failure indicator
Figure 8 – Invalid Elements marking
Figure 9 – The Active Validation Results window
- Improved Parameters and Arguments synchronization. The
new Active Validation functionality improves the parameters and
arguments synchronization made with MagicDraw 15.1. Active Validation
functionality displays unsynchronized elements on diagram pane and in
Browser. You can also use new Parameters Synchronization dialog for
automatic and manual synchronization solving.
NOTE: Synchronization between parameters and arguments means
synchronization between Parameters and Pins on Action, Parameters and
Call Message arguments, Parameters and Activity Parameter Nodes, and
other cases.
For more information about Parameters and Arguments
synchronization see Parameters section in MagicDraw UserManual.pdf.
Figure 10 – The Parameters Synchronization dialog
- Added capability to print and export the results
tables. New functionality is added to the validation results and
usages dependencies tables - now you can print them or export the
tables to the *.html and *.csv files.
Figure 11 - Print and export buttons in the Validation
Results window
