Release date: Monday, 18.04.11 - Due date: Easter Monday, 25.04.11, 23:59

Countries and Capitals

Persons as Employees and Family Members

Give us for for each of the two class diagrams above:

• An object diagram that is compatible with the class diagram. The object diagrams should contain at least four objects each.
• A variation of your object diagram that does violate the class diagram.

Two ways to model employment

Two ways to model appointments

Give us for each of the four class diagrams above:

• An object diagram that is compatible with the class diagram.
• Provide for the fourth class diagram an object diagram that violates the third class diagram.

Consider the following class diagrams (on the left) and object diagrams (on the top). Check for each class diagram the object diagrams which could be an instance of it (for example in form of a list).

	1	2	3	4

Now consider the following object diagrams (on the left) and class diagrams (on the top). Check for each object diagram the class diagrams which could be an instance of it (for example in form of a list).

	1	2	3	4

a) SVN Commit

Your task is to analyze the SVN commit procedure and represent it in form of a state machine diagram in astah. A normal commit without conflicting changes contains the following steps:

• update
• enter commit statement
• commit

In case there are conflicting changes, the conflicts must be merged after updating the files. There are three different options to merge a file:

• reverting to the current version in the SVN and discard the own changes
• commiting the own version
• manually merging the two versions

For further information see also resolve subversion conflicts

b) Consulting the SVN help

In any of these steps the user might look up the SVN help and return later on to the left step (state). Modify your statechart diagram to support this, too.