Updated the UML plan to reflect code changes
authorHeli Hyvättinen <heli.hyvattinen@kymp.net>
Mon, 6 Jun 2011 12:09:48 +0000 (15:09 +0300)
committerHeli Hyvättinen <heli.hyvattinen@kymp.net>
Mon, 6 Jun 2011 12:09:48 +0000 (15:09 +0300)
Added the ship graphic too

Ghost Ship UML.xmi
laiva.png [new file with mode: 0644]

index c800bf1..495f257 100644 (file)
@@ -1,5 +1,5 @@
 <?xml version="1.0" encoding="UTF-8"?>
-<XMI verified="false" xmi.version="1.2" timestamp="2011-05-24T18:27:33" xmlns:UML="http://schema.omg.org/spec/UML/1.3">
+<XMI verified="false" xmi.version="1.2" timestamp="2011-06-06T15:09:03" xmlns:UML="http://schema.omg.org/spec/UML/1.3">
  <XMI.header>
   <XMI.documentation>
    <XMI.exporter>umbrello uml modeller http://uml.sf.net</XMI.exporter>
         <UML:DataType stereotype="datatype" visibility="public" isSpecification="false" namespace="Datatypes" isAbstract="false" isLeaf="false" isRoot="false" xmi.id="7FoQDBpocOUG" name="string"/>
        </UML:Namespace.ownedElement>
       </UML:Package>
-      <UML:Class visibility="public" isSpecification="false" namespace="Logical View" isAbstract="false" isLeaf="false" isRoot="false" xmi.id="cmJcFyooDBTl" name="RotationControlledShip">
+      <UML:Class visibility="public" isSpecification="false" namespace="Logical View" isAbstract="false" isLeaf="false" isRoot="false" xmi.id="cmJcFyooDBTl" name="OrienntationControlledGraphicsPixmapObject">
        <UML:GeneralizableElement.generalization>
         <UML:Generalization xmi.idref="0O6itU7COdhf"/>
         <UML:Generalization xmi.idref="pePBG4qexe9Q"/>
+        <UML:Generalization xmi.idref="jHPD6mDwgfpo"/>
        </UML:GeneralizableElement.generalization>
        <UML:Classifier.feature>
         <UML:Attribute visibility="private" isSpecification="false" xmi.id="E7SiLdDJf0vR" type="HVgEKTRTuAUS" name="rotationSensor_"/>
         <UML:Operation visibility="public" isSpecification="false" isQuery="false" isAbstract="false" isLeaf="false" isRoot="false" xmi.id="E30DyQUU4imX" name="startMoving"/>
         <UML:Operation visibility="public" isSpecification="false" isQuery="false" isAbstract="false" isLeaf="false" isRoot="false" xmi.id="8FQIisJPfXWy" name="stopMoving"/>
         <UML:Operation visibility="public" isSpecification="false" isQuery="false" isAbstract="false" isLeaf="false" isRoot="false" xmi.id="rpMZq5v28tF5" name="readRotationSensor"/>
+        <UML:Operation visibility="protected" isSpecification="false" isQuery="false" isAbstract="false" isLeaf="false" isRoot="false" xmi.id="VqLThQ89hYAn" name="handleCollisions">
+         <UML:BehavioralFeature.parameter>
+          <UML:Parameter kind="return" xmi.id="2E6PtWv6EeIl" type="LEHanyUaSN4M"/>
+         </UML:BehavioralFeature.parameter>
+        </UML:Operation>
        </UML:Classifier.feature>
       </UML:Class>
       <UML:Class visibility="public" isSpecification="false" namespace="Logical View" isAbstract="false" isLeaf="false" isRoot="false" xmi.id="HVgEKTRTuAUS" name="QRotationSensor"/>
         <UML:AssociationEnd changeability="changeable" visibility="public" isNavigable="true" isSpecification="false" xmi.id="cLsleu1QerDg" type="XzOcNaMph9yB" name="" aggregation="none"/>
        </UML:Association.connection>
       </UML:Association>
+      <UML:Class visibility="public" isSpecification="false" namespace="Logical View" isAbstract="false" isLeaf="false" isRoot="false" xmi.id="HoOKzsbjGV56" name="Ship">
+       <UML:GeneralizableElement.generalization>
+        <UML:Generalization xmi.idref="AQco3QdzXt6m"/>
+        <UML:Generalization xmi.idref="ZTW4NcqYoIb5"/>
+        <UML:Generalization xmi.idref="X8SX8aulZnCp"/>
+       </UML:GeneralizableElement.generalization>
+       <UML:Classifier.feature>
+        <UML:Operation visibility="protected" isSpecification="false" isQuery="false" isAbstract="false" isLeaf="false" isRoot="false" xmi.id="f0tRGUWAB0dm" name="handleCollisions">
+         <UML:BehavioralFeature.parameter>
+          <UML:Parameter kind="return" xmi.id="40hiJUKhr0cN" type="LEHanyUaSN4M"/>
+         </UML:BehavioralFeature.parameter>
+        </UML:Operation>
+       </UML:Classifier.feature>
+      </UML:Class>
+      <UML:Association visibility="public" isSpecification="false" namespace="Logical View" xmi.id="Ng4SfjTmdUrO" name="">
+       <UML:Association.connection>
+        <UML:AssociationEnd changeability="changeable" visibility="public" isNavigable="false" isSpecification="false" xmi.id="1suSvAGJUFC3" type="cmJcFyooDBTl" name="" aggregation="none"/>
+        <UML:AssociationEnd changeability="changeable" visibility="public" isNavigable="true" isSpecification="false" xmi.id="wQY2UB1sr5IV" type="HoOKzsbjGV56" name="" aggregation="none"/>
+       </UML:Association.connection>
+      </UML:Association>
+      <UML:Generalization discriminator="" visibility="public" isSpecification="false" namespace="Logical View" child="cmJcFyooDBTl" xmi.id="jHPD6mDwgfpo" parent="HoOKzsbjGV56" name=""/>
+      <UML:Generalization discriminator="" visibility="public" isSpecification="false" namespace="Logical View" child="HoOKzsbjGV56" xmi.id="AQco3QdzXt6m" parent="5lTu70iDvlJn" name=""/>
+      <UML:Generalization discriminator="" visibility="public" isSpecification="false" namespace="Logical View" child="HoOKzsbjGV56" xmi.id="ZTW4NcqYoIb5" parent="JtWWJpEA6bpd" name=""/>
+      <UML:Generalization discriminator="" visibility="public" isSpecification="false" namespace="Logical View" child="HoOKzsbjGV56" xmi.id="X8SX8aulZnCp" parent="cmJcFyooDBTl" name=""/>
+      <UML:Association visibility="public" isSpecification="false" namespace="Logical View" xmi.id="Zh78SJwh0t5f" name="">
+       <UML:Association.connection>
+        <UML:AssociationEnd changeability="changeable" visibility="public" isNavigable="true" isSpecification="false" xmi.id="SGQ28usThPeS" type="HoOKzsbjGV56" name="" aggregation="none"/>
+        <UML:AssociationEnd changeability="changeable" visibility="public" isNavigable="true" isSpecification="false" xmi.id="WDklEX6lEDug" type="Tbq52XmJtNFL" name="" aggregation="none"/>
+       </UML:Association.connection>
+      </UML:Association>
      </UML:Namespace.ownedElement>
      <XMI.extension xmi.extender="umbrello">
       <diagrams>
        <diagram showopsig="1" linecolor="#ff0000" snapx="10" showattribassocs="1" snapy="10" linewidth="0" showattsig="1" isopen="1" showpackage="1" showpubliconly="1" showstereotype="1" name="luokkakaavio" font="Ubuntu,9,-1,5,50,0,0,0,0,0" canvasheight="876" canvaswidth="1747" localid="-1" snapcsgrid="0" showgrid="0" showops="1" griddotcolor="#a0a0a4" backgroundcolor="#c3c3c3" usefillcolor="1" fillcolor="#ffff00" zoom="100" xmi.id="p6gcOt8u0cHb" documentation="" showscope="1" snapgrid="0" showatts="1" type="1">
         <widgets>
-         <classwidget linecolor="#ff0000" usesdiagramfillcolor="0" linewidth="none" showoperations="1" usesdiagramusefillcolor="0" showpubliconly="0" showpackage="1" x="413" showattsigs="601" showstereotype="1" y="399" showattributes="1" font="Ubuntu,9,-1,5,50,0,0,0,0,0" width="340" isinstance="0" usefillcolor="1" fillcolor="#ffff00" xmi.id="cmJcFyooDBTl" showscope="1" height="248" showopsigs="601"/>
-         <classwidget linecolor="none" usesdiagramfillcolor="1" linewidth="none" showoperations="1" usesdiagramusefillcolor="1" showpubliconly="1" showpackage="1" x="181" showattsigs="601" showstereotype="1" y="152" showattributes="1" font="Ubuntu,9,-1,5,50,0,0,0,0,0" width="97" isinstance="0" usefillcolor="1" fillcolor="none" xmi.id="JtWWJpEA6bpd" showscope="1" height="55" showopsigs="601"/>
+         <classwidget linecolor="#ff0000" usesdiagramfillcolor="0" linewidth="none" showoperations="1" usesdiagramusefillcolor="0" showpubliconly="0" showpackage="1" x="410" showattsigs="601" showstereotype="1" y="395" showattributes="1" font="Ubuntu,9,-1,5,50,0,0,0,0,0" width="340" isinstance="0" usefillcolor="1" fillcolor="#ffff00" xmi.id="cmJcFyooDBTl" showscope="1" height="248" showopsigs="601"/>
+         <classwidget linecolor="none" usesdiagramfillcolor="1" linewidth="none" showoperations="1" usesdiagramusefillcolor="1" showpubliconly="1" showpackage="1" x="151" showattsigs="601" showstereotype="1" y="68" showattributes="1" font="Ubuntu,9,-1,5,50,0,0,0,0,0" width="97" isinstance="0" usefillcolor="1" fillcolor="none" xmi.id="JtWWJpEA6bpd" showscope="1" height="55" showopsigs="601"/>
          <classwidget linecolor="none" usesdiagramfillcolor="1" linewidth="none" showoperations="1" usesdiagramusefillcolor="1" showpubliconly="1" showpackage="1" x="333" showattsigs="601" showstereotype="1" y="155" showattributes="1" font="Ubuntu,9,-1,5,50,0,0,0,0,0" width="136" isinstance="0" usefillcolor="1" fillcolor="none" xmi.id="5lTu70iDvlJn" showscope="1" height="54" showopsigs="601"/>
          <classwidget linecolor="none" usesdiagramfillcolor="1" linewidth="none" showoperations="1" usesdiagramusefillcolor="1" showpubliconly="1" showpackage="1" x="1249" showattsigs="601" showstereotype="1" y="451" showattributes="1" font="Ubuntu,9,-1,5,50,0,0,0,0,0" width="157" isinstance="0" usefillcolor="1" fillcolor="none" xmi.id="pvwYlKFsbFLP" showscope="1" height="68" showopsigs="601"/>
          <classwidget linecolor="#ff0000" usesdiagramfillcolor="0" linewidth="none" showoperations="1" usesdiagramusefillcolor="0" showpubliconly="1" showpackage="1" x="1226" showattsigs="601" showstereotype="1" y="589" showattributes="1" font="Ubuntu,9,-1,5,50,0,0,0,0,0" width="273" isinstance="0" usefillcolor="1" fillcolor="#ffff00" xmi.id="Tbq52XmJtNFL" showscope="1" height="179" showopsigs="601"/>
          <classwidget linecolor="none" usesdiagramfillcolor="1" linewidth="none" showoperations="1" usesdiagramusefillcolor="1" showpubliconly="1" showpackage="1" x="908" showattsigs="601" showstereotype="1" y="290" showattributes="1" font="Ubuntu,9,-1,5,50,0,0,0,0,0" width="264" isinstance="0" usefillcolor="1" fillcolor="none" xmi.id="AbKKOgodDVuj" showscope="1" height="133" showopsigs="601"/>
          <classwidget linecolor="none" usesdiagramfillcolor="1" linewidth="none" showoperations="1" usesdiagramusefillcolor="1" showpubliconly="1" showpackage="1" x="1325" showattsigs="601" showstereotype="1" y="170" showattributes="1" font="Ubuntu,9,-1,5,50,0,0,0,0,0" width="232" isinstance="0" usefillcolor="1" fillcolor="none" xmi.id="I7cafWFM6qXf" showscope="1" height="142" showopsigs="601"/>
          <classwidget linecolor="none" usesdiagramfillcolor="1" linewidth="none" showoperations="1" usesdiagramusefillcolor="1" showpubliconly="1" showpackage="1" x="1601" showattsigs="601" showstereotype="1" y="207" showattributes="1" font="Ubuntu,9,-1,5,50,0,0,0,0,0" width="97" isinstance="0" usefillcolor="1" fillcolor="none" xmi.id="DN7nNQFDFoHs" showscope="1" height="91" showopsigs="601"/>
-         <classwidget linecolor="none" usesdiagramfillcolor="1" linewidth="none" showoperations="1" usesdiagramusefillcolor="1" showpubliconly="1" showpackage="1" x="1576" showattsigs="601" showstereotype="1" y="418" showattributes="1" font="Ubuntu,9,-1,5,75,0,0,0,0,0" width="100" isinstance="0" usefillcolor="1" fillcolor="none" xmi.id="XzOcNaMph9yB" showscope="1" height="120" showopsigs="601"/>
+         <classwidget linecolor="none" usesdiagramfillcolor="1" linewidth="none" showoperations="1" usesdiagramusefillcolor="1" showpubliconly="1" showpackage="1" x="1576" showattsigs="601" showstereotype="1" y="418" showattributes="1" font="Ubuntu,9,-1,5,50,0,0,0,0,0" width="100" isinstance="0" usefillcolor="1" fillcolor="none" xmi.id="XzOcNaMph9yB" showscope="1" height="120" showopsigs="601"/>
+         <classwidget linecolor="#ff0000" usesdiagramfillcolor="0" linewidth="none" showoperations="1" usesdiagramusefillcolor="0" showpubliconly="1" showpackage="1" x="806" showattsigs="601" showstereotype="1" y="577" showattributes="1" font="Ubuntu,9,-1,5,75,0,0,0,0,0" width="264" isinstance="0" usefillcolor="1" fillcolor="#ffff00" xmi.id="HoOKzsbjGV56" showscope="1" height="73" showopsigs="601"/>
         </widgets>
         <messages/>
         <associations>
          <assocwidget indexa="2" indexb="2" widgetaid="cmJcFyooDBTl" linecolor="none" totalcounta="3" xmi.id="0O6itU7COdhf" widgetbid="5lTu70iDvlJn" totalcountb="4" type="500" linewidth="none">
           <linepath>
-           <startpoint startx="469" starty="399"/>
+           <startpoint startx="469" starty="395"/>
            <endpoint endx="469" endy="209"/>
           </linepath>
          </assocwidget>
          <assocwidget indexa="1" indexb="2" widgetaid="cmJcFyooDBTl" linecolor="none" totalcounta="3" xmi.id="pePBG4qexe9Q" widgetbid="JtWWJpEA6bpd" totalcountb="3" type="500" linewidth="none">
           <linepath>
-           <startpoint startx="413" starty="399"/>
-           <endpoint endx="278" endy="207"/>
+           <startpoint startx="410" starty="395"/>
+           <endpoint endx="248" endy="123"/>
           </linepath>
          </assocwidget>
          <assocwidget indexa="2" indexb="1" widgetaid="Tbq52XmJtNFL" linecolor="none" totalcounta="4" xmi.id="RL5P5aqtVkRF" widgetbid="pvwYlKFsbFLP" totalcountb="2" type="500" linewidth="none">
          </assocwidget>
          <assocwidget indexa="1" indexb="1" widgetaid="KptrjeIHW3lK" linecolor="none" totalcounta="3" xmi.id="vvx5w0jrcSg7" widgetbid="JtWWJpEA6bpd" totalcountb="3" type="500" linewidth="none">
           <linepath>
-           <startpoint startx="270" starty="759"/>
-           <endpoint endx="270" endy="207"/>
+           <startpoint startx="243" starty="759"/>
+           <endpoint endx="243" endy="123"/>
           </linepath>
          </assocwidget>
          <assocwidget indexa="2" indexb="1" widgetaid="KptrjeIHW3lK" linecolor="none" totalcounta="3" xmi.id="twoWPVbMn5Aa" widgetbid="5lTu70iDvlJn" totalcountb="4" type="500" linewidth="none">
            <endpoint endx="333" endy="209"/>
           </linepath>
          </assocwidget>
-         <assocwidget indexa="1" indexb="2" widgetaid="cmJcFyooDBTl" linecolor="none" totalcounta="2" xmi.id="sM1RWZF1sdSD" widgetbid="Tbq52XmJtNFL" totalcountb="4" type="503" linewidth="none">
-          <linepath>
-           <startpoint startx="753" starty="601"/>
-           <endpoint endx="1226" endy="601"/>
-          </linepath>
-         </assocwidget>
          <assocwidget indexa="1" indexb="3" widgetaid="KptrjeIHW3lK" linecolor="none" totalcounta="2" xmi.id="lqSdTsoEdYpR" widgetbid="Tbq52XmJtNFL" totalcountb="4" type="503" linewidth="none">
           <linepath>
            <startpoint startx="284" starty="759"/>
            <endpoint endx="1226" endy="589"/>
            <point x="807" y="377"/>
           </linepath>
-          <floatingtext linecolor="none" usesdiagramfillcolor="1" linewidth="none" usesdiagramusefillcolor="1" x="638" showstereotype="1" y="293" text="ghosts and rocks" font="Ubuntu,9,-1,5,50,0,0,0,0,0" pretext="" role="703" width="99" isinstance="0" posttext="" usefillcolor="1" fillcolor="none" xmi.id="QUe4dqFF5ODl" height="18"/>
-          <floatingtext linecolor="none" usesdiagramfillcolor="1" linewidth="none" usesdiagramusefillcolor="1" x="445" showstereotype="1" y="215" text="1" font="Ubuntu,9,-1,5,50,0,0,0,0,0" pretext="" role="701" width="15" isinstance="0" posttext="" usefillcolor="1" fillcolor="none" xmi.id="R7n9WbDZ4bC2" height="18"/>
-          <floatingtext linecolor="none" usesdiagramfillcolor="1" linewidth="none" usesdiagramusefillcolor="1" x="1219" showstereotype="1" y="551" text="1" font="Ubuntu,9,-1,5,50,0,0,0,0,0" pretext="" role="702" width="15" isinstance="0" posttext="" usefillcolor="1" fillcolor="none" xmi.id="WVZaK64iahmB" height="18"/>
+          <floatingtext linecolor="none" usesdiagramfillcolor="1" linewidth="none" usesdiagramusefillcolor="1" x="638" showstereotype="1" y="293" text="ghosts and rocks" font="Ubuntu,9,-1,5,50,0,0,0,0,0" pretext="" role="703" width="99" isinstance="0" posttext="" usefillcolor="1" fillcolor="none" xmi.id="Wymv4jOL4AUH" height="18"/>
+          <floatingtext linecolor="none" usesdiagramfillcolor="1" linewidth="none" usesdiagramusefillcolor="1" x="445" showstereotype="1" y="215" text="1" font="Ubuntu,9,-1,5,50,0,0,0,0,0" pretext="" role="701" width="15" isinstance="0" posttext="" usefillcolor="1" fillcolor="none" xmi.id="kOwOr9vH357z" height="18"/>
+          <floatingtext linecolor="none" usesdiagramfillcolor="1" linewidth="none" usesdiagramusefillcolor="1" x="1219" showstereotype="1" y="551" text="1" font="Ubuntu,9,-1,5,50,0,0,0,0,0" pretext="" role="702" width="15" isinstance="0" posttext="" usefillcolor="1" fillcolor="none" xmi.id="e09u14nX1YS5" height="18"/>
          </assocwidget>
          <assocwidget indexa="1" indexb="1" widgetaid="AbKKOgodDVuj" linecolor="none" totalcounta="3" xmi.id="nRcOFJO68hTA" widgetbid="I7cafWFM6qXf" totalcountb="2" type="512" linewidth="none">
           <linepath>
            <endpoint endx="1576" endy="538"/>
           </linepath>
          </assocwidget>
+         <assocwidget indexa="1" indexb="1" widgetaid="HoOKzsbjGV56" linecolor="none" totalcounta="2" xmi.id="X8SX8aulZnCp" widgetbid="cmJcFyooDBTl" totalcountb="2" type="500" linewidth="none">
+          <linepath>
+           <startpoint startx="806" starty="625"/>
+           <endpoint endx="750" endy="625"/>
+          </linepath>
+         </assocwidget>
+         <assocwidget indexa="1" indexb="2" widgetaid="HoOKzsbjGV56" linecolor="none" totalcounta="2" xmi.id="Zh78SJwh0t5f" widgetbid="Tbq52XmJtNFL" totalcountb="4" type="503" linewidth="none">
+          <linepath>
+           <startpoint startx="1070" starty="625"/>
+           <endpoint endx="1226" endy="625"/>
+          </linepath>
+         </assocwidget>
         </associations>
        </diagram>
       </diagrams>
   </UML:Model>
  </XMI.content>
  <XMI.extensions xmi.extender="umbrello">
-  <docsettings viewid="p6gcOt8u0cHb" uniqueid="cLsleu1QerDg" documentation=""/>
+  <docsettings viewid="p6gcOt8u0cHb" uniqueid="2E6PtWv6EeIl" documentation=""/>
   <listview>
    <listitem open="1" type="800" id="Views">
     <listitem open="1" type="801" id="Logical View">
       <listitem open="0" type="815" id="RZKZFmiM0Z1K"/>
       <listitem open="0" type="815" id="pO3oWF2ymLV1"/>
      </listitem>
+     <listitem open="1" type="813" id="HoOKzsbjGV56">
+      <listitem open="0" type="815" id="f0tRGUWAB0dm"/>
+     </listitem>
      <listitem open="1" type="813" id="5lTu70iDvlJn"/>
      <listitem open="1" type="813" id="pvwYlKFsbFLP"/>
      <listitem open="1" type="813" id="DN7nNQFDFoHs"/>
       <listitem open="0" type="815" id="E30DyQUU4imX"/>
       <listitem open="0" type="815" id="8FQIisJPfXWy"/>
       <listitem open="0" type="815" id="rpMZq5v28tF5"/>
+      <listitem open="0" type="815" id="VqLThQ89hYAn"/>
      </listitem>
      <listitem open="1" type="813" id="I7cafWFM6qXf"/>
      <listitem open="1" type="813" id="Tbq52XmJtNFL">
diff --git a/laiva.png b/laiva.png
new file mode 100644 (file)
index 0000000..cfe01ec
Binary files /dev/null and b/laiva.png differ