Merge branch 'domain-model' into 'master'

Update domain model to use different answer types

See merge request swtp-block-ws17/arsnova-angular-frontend!1

docs/domain_model.uxf

@@ -6,7 +6,7 @@
     <coordinates>
       <x>0</x>
       <y>0</y>
-      <w>960</w>
+      <w>1020</w>
       <h>600</h>
     </coordinates>
     <panel_attributes>ARSnova
@@ -183,7 +183,7 @@ contains &gt;</panel_attributes>
   <element>
     <id>UMLClass</id>
     <coordinates>
-      <x>380</x>
+      <x>430</x>
       <y>560</y>
       <w>100</w>
       <h>30</h>
@@ -195,7 +195,7 @@ contains &gt;</panel_attributes>
   <element>
     <id>UMLClass</id>
     <coordinates>
-      <x>490</x>
+      <x>550</x>
       <y>560</y>
       <w>100</w>
       <h>30</h>
@@ -203,49 +203,27 @@ contains &gt;</panel_attributes>
     <panel_attributes>ChoiceContent</panel_attributes>
     <additional_attributes/>
   </element>
-  <element>
-    <id>UMLClass</id>
-    <coordinates>
-      <x>600</x>
-      <y>560</y>
-      <w>100</w>
-      <h>30</h>
-    </coordinates>
-    <panel_attributes>...Content</panel_attributes>
-    <additional_attributes/>
-  </element>
   <element>
     <id>Relation</id>
     <coordinates>
-      <x>420</x>
-      <y>500</y>
-      <w>100</w>
-      <h>80</h>
-    </coordinates>
-    <panel_attributes>lt=&lt;&lt;-</panel_attributes>
-    <additional_attributes>80.0;10.0;80.0;40.0;10.0;40.0;10.0;60.0</additional_attributes>
-  </element>
-  <element>
-    <id>Relation</id>
-    <coordinates>
-      <x>570</x>
+      <x>470</x>
       <y>500</y>
-      <w>100</w>
+      <w>80</w>
       <h>80</h>
     </coordinates>
     <panel_attributes>lt=&lt;&lt;-</panel_attributes>
-    <additional_attributes>10.0;10.0;10.0;40.0;80.0;40.0;80.0;60.0</additional_attributes>
+    <additional_attributes>60.0;10.0;60.0;40.0;10.0;40.0;10.0;60.0</additional_attributes>
   </element>
   <element>
     <id>Relation</id>
     <coordinates>
-      <x>530</x>
+      <x>540</x>
       <y>500</y>
-      <w>30</w>
+      <w>80</w>
       <h>80</h>
     </coordinates>
     <panel_attributes>lt=&lt;&lt;-</panel_attributes>
-    <additional_attributes>10.0;10.0;10.0;60.0</additional_attributes>
+    <additional_attributes>10.0;10.0;10.0;40.0;60.0;40.0;60.0;60.0</additional_attributes>
   </element>
   <element>
     <id>Relation</id>
@@ -278,7 +256,7 @@ has &gt;</panel_attributes>
   <element>
     <type>CustomElementImpl</type>
     <coordinates>
-      <x>410</x>
+      <x>470</x>
       <y>610</y>
       <w>551</w>
       <h>331</h>
@@ -444,4 +422,48 @@ m2=*
 has &gt;</panel_attributes>
     <additional_attributes>10.0;20.0;90.0;20.0</additional_attributes>
   </element>
+  <element>
+    <id>UMLClass</id>
+    <coordinates>
+      <x>790</x>
+      <y>520</y>
+      <w>100</w>
+      <h>30</h>
+    </coordinates>
+    <panel_attributes>TextAnswer</panel_attributes>
+    <additional_attributes/>
+  </element>
+  <element>
+    <id>Relation</id>
+    <coordinates>
+      <x>900</x>
+      <y>460</y>
+      <w>80</w>
+      <h>80</h>
+    </coordinates>
+    <panel_attributes>lt=&lt;&lt;-</panel_attributes>
+    <additional_attributes>10.0;10.0;10.0;40.0;60.0;40.0;60.0;60.0</additional_attributes>
+  </element>
+  <element>
+    <id>Relation</id>
+    <coordinates>
+      <x>830</x>
+      <y>460</y>
+      <w>80</w>
+      <h>80</h>
+    </coordinates>
+    <panel_attributes>lt=&lt;&lt;-</panel_attributes>
+    <additional_attributes>60.0;10.0;60.0;40.0;10.0;40.0;10.0;60.0</additional_attributes>
+  </element>
+  <element>
+    <id>UMLClass</id>
+    <coordinates>
+      <x>910</x>
+      <y>520</y>
+      <w>100</w>
+      <h>30</h>
+    </coordinates>
+    <panel_attributes>ChoiceAnswer</panel_attributes>
+    <additional_attributes/>
+  </element>
 </diagram>