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 object diagrams that are compatible with the class diagram. For the fourth class diagram we want to see an object diagram that is not compatible with the third class diagram.

Have a look at the following class diagrams (on the left) and object diagrams (on the top). Give us for each class diagram the object diagrams which could be an instance it. (For example you could prepare a list.)

	1	2	3	4

Again have a look at the following class diagrams (on the top) and object diagrams (on the left). Give us for each object diagram the class diagrams it could be an instance of.

	1	2	3	4

a) SVN Commit

Your task is to analyze the SVN commit procedure with a state chart. The normal steps without conflicting changes are:

• 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 SVN version
• commiting the own version
• manually merging the two versions

See also resolve subversion conflicts

Create a state chart diagram with Astah UML for these use cases.

b) Consulting the SVN help

Lets assume that a user will not keep these steps in mind all the time. So in any of these steps the user might look up the svn help pages and return to the last step (state). Modify your state chart to support this, too.