Slim down diagram

2 files changed, 12 insertions, 21 deletions

diff --git a/assignments/3/question-6.png b/assignments/3/question-6.png
index d73d9eb..9f72d70 100644
--- a/assignments/3/question-6.png
+++ b/assignments/3/question-6.png
diff --git a/assignments/3/question-6.puml b/assignments/3/question-6.puml
index 51094a9..7f11657 100644
--- a/assignments/3/question-6.puml
+++ b/assignments/3/question-6.puml
@@ -4,29 +4,25 @@ Owner <|-- Corporation
 Person <|-- Pilot
 Person <|-- Employee
 
-Hanger "1" --> "*" Airplane
-Owner "1" --> "*" Airplane
+Hanger "1" -- "*" Airplane : storedIn
+Owner "1" -- "*" Airplane : ownedBy
 Maintenance "1" -- "1" Airplane
 Maintenance "1" -- "1"  Employee
 
-Employee "1" --> "*" Hanger
-Pilot "1" --> "*" Restriction
-Pilot "1" --> "*" Airplane : fly
+Employee "1" -- "*" Hanger : managedBy
+Pilot "1" --> "*" Airplane : flyableBy
 Employee "1" --> "*" Airplane : service
 
 class Airplane {
-  {field} id
 	{field} capacity
 	{field} modelNumber
 	{field} registrationNumber
 	{field} weight
-  + hanger : Hanger [1]
-	+ owner : Owner [1]
   + maintenances : Maintenance[*]
+  {method} boolean storedIn(hanger)
 }
 
 class Maintenance {
-  {field} id
   {field} workCode
   {field} startedAt
   {field} endedAt
@@ -36,15 +32,14 @@ class Maintenance {
 }
 
 class Hanger {
-  {field} id
 	{field} number
 	{field} capacity
 	{field} location
-  {field} employee : Employee [1]
+  {method} boolean hasCapacityFor(airplane)
+  {method} boolean isHomeFor(airplane)
 }
 
 abstract class Owner {
-  {field} id
   {field} name
   {field} address
   {field} telephoneNumber
@@ -56,23 +51,19 @@ abstract class Person {
 
 class Pilot {
   {field} licenseNumber
-  + restrictions : Restriction [*]
-  + canFly : Airplane [*]
+  {field} restrictions
+  {method} boolean canFly(airplane)
 }
 
 class Employee {
   {field} salary
   {field} shift
-
-  {method} +canService() : Airplane [*]
+  {field} maintenances : Maintenance [*]
+  {method} boolean canService(airplane)
+  {method} boolean hasServiced(airplane)
 }
 
 class Corporation {
 }
 
-class Restriction {
-  + id
-  + description
-}
-
 @enduml