Se cambia la interfaz Runnable por una clase.

diff --git a/docs/cliente_servidor.xmi b/docs/cliente_servidor.xmi
index a75d8e5bfa999ac295fff79a5c9262413ac36639..520ebc17c356d1753337ad063bf09e1e182d6e18 100644 (file)
--- a/docs/cliente_servidor.xmi
+++ b/docs/cliente_servidor.xmi
@@ -10,12 +10,8 @@
   <XMI.metamodel xmi.name="UML" href="UML.xml" xmi.version="1.3" />
  </XMI.header>
  <XMI.content>
   <XMI.metamodel xmi.name="UML" href="UML.xml" xmi.version="1.3" />
  </XMI.header>
  <XMI.content>

-  <docsettings viewid="1" documentation="" uniqueid="50" />
+  <docsettings viewid="1" documentation="" uniqueid="54" />

   <umlobjects>
   <umlobjects>

-   <UML:Interface stereotype="interface" package="Plaqui" xmi.id="2" abstract="1" documentation="Interfaz para usar con objetos que realizan una tarea.
-Generalmente las tareas son lanzadas en threads." name="Runnable" static="0" scope="200" >
-    <UML:Operation stereotype="" package="" xmi.id="3" type="void" abstract="1" documentation="" name="run" static="0" scope="200" />
-   </UML:Interface>

    <UML:Class stereotype="class" package="Plaqui" xmi.id="4" abstract="0" documentation="Servidor de plantas químicas.
 Maneja muchas conexiones, de control o de transmisión." name="Server" static="0" scope="200" >
     <UML:Operation stereotype="" package="" xmi.id="24" type="bool" abstract="0" documentation="Comienza la transimisión del estado de una planta." name="start_transmission" static="0" scope="200" >
    <UML:Class stereotype="class" package="Plaqui" xmi.id="4" abstract="0" documentation="Servidor de plantas químicas.
 Maneja muchas conexiones, de control o de transmisión." name="Server" static="0" scope="200" >
     <UML:Operation stereotype="" package="" xmi.id="24" type="bool" abstract="0" documentation="Comienza la transimisión del estado de una planta." name="start_transmission" static="0" scope="200" >


@@ -61,61 +57,64 @@ Maneja muchas conexiones, de control o de transmisión." name="Server" static="0
      <UML:Parameter stereotype="" package="" xmi.id="1" value="" type="int" abstract="0" documentation="Socket a usar para recibir comandos." name="socket" static="0" scope="201" />
     </UML:Operation>
    </UML:Class>
      <UML:Parameter stereotype="" package="" xmi.id="1" value="" type="int" abstract="0" documentation="Socket a usar para recibir comandos." name="socket" static="0" scope="201" />
     </UML:Operation>
    </UML:Class>

+   <UML:Class stereotype="class" package="Plaqui" xmi.id="51" abstract="1" documentation="Interfaz que indica que puede realizar una tarea (generalmente en un thread)." name="Runnable" static="0" scope="200" >
+    <UML:Operation stereotype="" package="" xmi.id="52" type="void" abstract="1" documentation="Realiza la tarea." name="run" static="0" scope="200" />
+   </UML:Class>

    <UML:Association nameb="" stereotype="" visibilitya="200" visibilityb="200" assoctype="500" rolea="13" roleb="15" multia="" doca="" multib="" docb="" package="" xmi.id="26" abstract="0" documentation="" name="" static="0" scope="200" changeabilitya="900" changeabilityb="900" namea="" />
    <UML:Association nameb="" stereotype="" visibilitya="200" visibilityb="200" assoctype="500" rolea="12" roleb="15" multia="" doca="" multib="" docb="" package="" xmi.id="27" abstract="0" documentation="" name="" static="0" scope="200" changeabilitya="900" changeabilityb="900" namea="" />
    <UML:Association nameb="" stereotype="" visibilitya="200" visibilityb="200" assoctype="500" rolea="11" roleb="15" multia="" doca="" multib="" docb="" package="" xmi.id="29" abstract="0" documentation="" name="" static="0" scope="200" changeabilitya="900" changeabilityb="900" namea="" />
    <UML:Association nameb="" stereotype="" visibilitya="200" visibilityb="200" assoctype="500" rolea="13" roleb="15" multia="" doca="" multib="" docb="" package="" xmi.id="26" abstract="0" documentation="" name="" static="0" scope="200" changeabilitya="900" changeabilityb="900" namea="" />
    <UML:Association nameb="" stereotype="" visibilitya="200" visibilityb="200" assoctype="500" rolea="12" roleb="15" multia="" doca="" multib="" docb="" package="" xmi.id="27" abstract="0" documentation="" name="" static="0" scope="200" changeabilitya="900" changeabilityb="900" namea="" />
    <UML:Association nameb="" stereotype="" visibilitya="200" visibilityb="200" assoctype="500" rolea="11" roleb="15" multia="" doca="" multib="" docb="" package="" xmi.id="29" abstract="0" documentation="" name="" static="0" scope="200" changeabilitya="900" changeabilityb="900" namea="" />

-   <UML:Association nameb="" stereotype="" visibilitya="200" visibilityb="200" assoctype="511" rolea="15" roleb="2" multia="" doca="" multib="" docb="" package="" xmi.id="30" abstract="0" documentation="" name="" static="0" scope="200" changeabilitya="900" changeabilityb="900" namea="" />
-   <UML:Association nameb="" stereotype="" visibilitya="200" visibilityb="200" assoctype="511" rolea="4" roleb="2" multia="" doca="" multib="" docb="" package="" xmi.id="31" abstract="0" documentation="" name="" static="0" scope="200" changeabilitya="900" changeabilityb="900" namea="" />

    <UML:Association nameb="" stereotype="" visibilitya="200" visibilityb="200" assoctype="500" rolea="43" roleb="15" multia="" doca="" multib="" docb="" package="" xmi.id="44" abstract="0" documentation="" name="" static="0" scope="200" changeabilitya="900" changeabilityb="900" namea="" />
    <UML:Association nameb="" stereotype="" visibilitya="200" visibilityb="200" assoctype="500" rolea="43" roleb="15" multia="" doca="" multib="" docb="" package="" xmi.id="44" abstract="0" documentation="" name="" static="0" scope="200" changeabilitya="900" changeabilityb="900" namea="" />

+   <UML:Association nameb="" stereotype="" visibilitya="200" visibilityb="200" assoctype="500" rolea="4" roleb="51" multia="" doca="" multib="" docb="" package="" xmi.id="53" abstract="0" documentation="" name="" static="0" scope="200" changeabilitya="900" changeabilityb="900" namea="" />
+   <UML:Association nameb="" stereotype="" visibilitya="200" visibilityb="200" assoctype="500" rolea="15" roleb="51" multia="" doca="" multib="" docb="" package="" xmi.id="54" abstract="0" documentation="" name="" static="0" scope="200" changeabilitya="900" changeabilityb="900" namea="" />

   </umlobjects>
   <diagrams>
    <diagram snapgrid="0" showattsig="1" fillcolor="#ffffc0" zoom="100" showgrid="1" showopsig="1" usefillcolor="1" snapx="10" canvaswidth="746" snapy="10" showatts="1" xmi.id="1" documentation="" type="402" showops="1" showpackage="1" name="Jerarquía" localid="30000" showstereotype="0" showscope="1" snapcsgrid="0" font="Helvetica,12,-1,5,48,0,0,0,0,0" linecolor="#ff0000" canvasheight="656" >
     <widgets>
   </umlobjects>
   <diagrams>
    <diagram snapgrid="0" showattsig="1" fillcolor="#ffffc0" zoom="100" showgrid="1" showopsig="1" usefillcolor="1" snapx="10" canvaswidth="746" snapy="10" showatts="1" xmi.id="1" documentation="" type="402" showops="1" showpackage="1" name="Jerarquía" localid="30000" showstereotype="0" showscope="1" snapcsgrid="0" font="Helvetica,12,-1,5,48,0,0,0,0,0" linecolor="#ff0000" canvasheight="656" >
     <widgets>

-     <UML:ClassWidget usesdiagramfillcolour="0" width="289" showattsigs="601" usesdiagramusefillcolour="0" x="420" linecolour="#ff0000" y="170" showopsigs="600" instancename="" usesdiagramlinecolour="0" fillcolour="#ffffc0" height="133" usefillcolor="1" showattributes="1" isinstance="0" xmi.id="4" showoperations="1" showpackage="1" showscope="1" showstereotype="0" font="Helvetica,12,-1,5,50,0,1,0,0,0" />
-     <UML:ClassWidget usesdiagramfillcolour="0" width="175" showattsigs="601" usesdiagramusefillcolour="0" x="230" linecolour="#ff0000" y="290" showopsigs="600" instancename="" usesdiagramlinecolour="0" fillcolour="#ffffc0" height="57" usefillcolor="1" showattributes="1" isinstance="0" xmi.id="15" showoperations="1" showpackage="1" showscope="1" showstereotype="0" font="Helvetica,12,-1,5,75,1,0,0,0,0" />
-     <interfacewidget usesdiagramfillcolour="0" width="143" usesdiagramusefillcolour="0" x="371" linecolour="#ff0000" y="16" drawascircle="0" showopsigs="600" instancename="" usesdiagramlinecolour="0" fillcolour="#ffffc0" height="57" usefillcolor="1" isinstance="0" xmi.id="2" showoperations="1" showpackage="1" showscope="1" font="Helvetica,12,-1,5,50,1,0,0,0,0" />
+     <UML:ClassWidget usesdiagramfillcolour="0" width="289" showattsigs="601" usesdiagramusefillcolour="0" x="420" linecolour="#ff0000" y="168" showopsigs="600" instancename="" usesdiagramlinecolour="0" fillcolour="#ffffc0" height="133" usefillcolor="1" showattributes="1" isinstance="0" xmi.id="4" showoperations="1" showpackage="1" showscope="1" showstereotype="0" font="Helvetica,12,-1,5,50,0,1,0,0,0" />
+     <UML:ClassWidget usesdiagramfillcolour="0" width="175" showattsigs="601" usesdiagramusefillcolour="0" x="230" linecolour="#ff0000" y="244" showopsigs="600" instancename="" usesdiagramlinecolour="0" fillcolour="#ffffc0" height="57" usefillcolor="1" showattributes="1" isinstance="0" xmi.id="15" showoperations="1" showpackage="1" showscope="1" showstereotype="0" font="Helvetica,12,-1,5,50,0,1,0,0,0" />

      <UML:ClassWidget usesdiagramfillcolour="0" width="170" showattsigs="601" usesdiagramusefillcolour="0" x="517" linecolour="#ff0000" y="450" showopsigs="600" instancename="" usesdiagramlinecolour="0" fillcolour="#ffffc0" height="47" usefillcolor="1" showattributes="1" isinstance="0" xmi.id="11" showoperations="1" showpackage="1" showscope="1" showstereotype="0" font="Helvetica,12,-1,5,50,0,1,0,0,0" />
      <UML:ClassWidget usesdiagramfillcolour="1" width="177" showattsigs="601" usesdiagramusefillcolour="1" x="327" linecolour="none" y="450" showopsigs="600" instancename="" usesdiagramlinecolour="1" fillcolour="none" height="37" usefillcolor="1" showattributes="1" isinstance="0" xmi.id="39" showoperations="1" showpackage="1" showscope="1" showstereotype="0" font="Helvetica,12,-1,5,75,0,0,0,0,0" />
      <UML:ClassWidget usesdiagramfillcolour="0" width="137" showattsigs="601" usesdiagramusefillcolour="0" x="179" linecolour="#ff0000" y="450" showopsigs="600" instancename="" usesdiagramlinecolour="0" fillcolour="#ffffc0" height="47" usefillcolor="1" showattributes="1" isinstance="0" xmi.id="12" showoperations="1" showpackage="1" showscope="1" showstereotype="0" font="Helvetica,12,-1,5,50,0,1,0,0,0" />
      <UML:ClassWidget usesdiagramfillcolour="0" width="157" showattsigs="601" usesdiagramusefillcolour="0" x="10" linecolour="#ff0000" y="449" showopsigs="600" instancename="" usesdiagramlinecolour="0" fillcolour="#ffffc0" height="47" usefillcolor="1" showattributes="1" isinstance="0" xmi.id="13" showoperations="1" showpackage="1" showscope="1" showstereotype="0" font="Helvetica,12,-1,5,50,0,1,0,0,0" />
      <UML:ClassWidget usesdiagramfillcolour="0" width="177" showattsigs="601" usesdiagramusefillcolour="0" x="327" linecolour="#ff0000" y="450" showopsigs="600" instancename="" usesdiagramlinecolour="0" fillcolour="#ffffc0" height="47" usefillcolor="1" showattributes="1" isinstance="0" xmi.id="43" showoperations="1" showpackage="1" showscope="1" showstereotype="0" font="Helvetica,12,-1,5,50,0,1,0,0,0" />
      <UML:ClassWidget usesdiagramfillcolour="0" width="170" showattsigs="601" usesdiagramusefillcolour="0" x="517" linecolour="#ff0000" y="450" showopsigs="600" instancename="" usesdiagramlinecolour="0" fillcolour="#ffffc0" height="47" usefillcolor="1" showattributes="1" isinstance="0" xmi.id="11" showoperations="1" showpackage="1" showscope="1" showstereotype="0" font="Helvetica,12,-1,5,50,0,1,0,0,0" />
      <UML:ClassWidget usesdiagramfillcolour="1" width="177" showattsigs="601" usesdiagramusefillcolour="1" x="327" linecolour="none" y="450" showopsigs="600" instancename="" usesdiagramlinecolour="1" fillcolour="none" height="37" usefillcolor="1" showattributes="1" isinstance="0" xmi.id="39" showoperations="1" showpackage="1" showscope="1" showstereotype="0" font="Helvetica,12,-1,5,75,0,0,0,0,0" />
      <UML:ClassWidget usesdiagramfillcolour="0" width="137" showattsigs="601" usesdiagramusefillcolour="0" x="179" linecolour="#ff0000" y="450" showopsigs="600" instancename="" usesdiagramlinecolour="0" fillcolour="#ffffc0" height="47" usefillcolor="1" showattributes="1" isinstance="0" xmi.id="12" showoperations="1" showpackage="1" showscope="1" showstereotype="0" font="Helvetica,12,-1,5,50,0,1,0,0,0" />
      <UML:ClassWidget usesdiagramfillcolour="0" width="157" showattsigs="601" usesdiagramusefillcolour="0" x="10" linecolour="#ff0000" y="449" showopsigs="600" instancename="" usesdiagramlinecolour="0" fillcolour="#ffffc0" height="47" usefillcolor="1" showattributes="1" isinstance="0" xmi.id="13" showoperations="1" showpackage="1" showscope="1" showstereotype="0" font="Helvetica,12,-1,5,50,0,1,0,0,0" />
      <UML:ClassWidget usesdiagramfillcolour="0" width="177" showattsigs="601" usesdiagramusefillcolour="0" x="327" linecolour="#ff0000" y="450" showopsigs="600" instancename="" usesdiagramlinecolour="0" fillcolour="#ffffc0" height="47" usefillcolor="1" showattributes="1" isinstance="0" xmi.id="43" showoperations="1" showpackage="1" showscope="1" showstereotype="0" font="Helvetica,12,-1,5,50,0,1,0,0,0" />

+     <UML:ClassWidget usesdiagramfillcolour="0" width="143" showattsigs="601" usesdiagramusefillcolour="0" x="345" linecolour="#ff0000" y="45" showopsigs="601" instancename="" usesdiagramlinecolour="0" fillcolour="#ffffc0" height="47" usefillcolor="1" showattributes="1" isinstance="0" xmi.id="51" showoperations="1" showpackage="1" showscope="1" showstereotype="0" font="Helvetica,12,-1,5,75,1,0,0,0,0" />

     </widgets>
     <messages/>
     <associations>
      <UML:AssocWidget totalcounta="2" indexa="1" totalcountb="5" indexb="1" widgetbid="15" widgetaid="13" xmi.id="26" >
       <linepath>
        <startpoint startx="88" starty="449" />
     </widgets>
     <messages/>
     <associations>
      <UML:AssocWidget totalcounta="2" indexa="1" totalcountb="5" indexb="1" widgetbid="15" widgetaid="13" xmi.id="26" >
       <linepath>
        <startpoint startx="88" starty="449" />

-       <endpoint endx="265" endy="347" />
+       <endpoint endx="265" endy="301" />

       </linepath>
      </UML:AssocWidget>
      <UML:AssocWidget totalcounta="2" indexa="1" totalcountb="5" indexb="2" widgetbid="15" widgetaid="12" xmi.id="27" >
       <linepath>
        <startpoint startx="247" starty="450" />
       </linepath>
      </UML:AssocWidget>
      <UML:AssocWidget totalcounta="2" indexa="1" totalcountb="5" indexb="2" widgetbid="15" widgetaid="12" xmi.id="27" >
       <linepath>
        <startpoint startx="247" starty="450" />

-       <endpoint endx="300" endy="347" />
+       <endpoint endx="300" endy="301" />

       </linepath>
      </UML:AssocWidget>
      <UML:AssocWidget totalcounta="2" indexa="1" totalcountb="5" indexb="4" widgetbid="15" widgetaid="11" xmi.id="29" >
       <linepath>
        <startpoint startx="602" starty="450" />
       </linepath>
      </UML:AssocWidget>
      <UML:AssocWidget totalcounta="2" indexa="1" totalcountb="5" indexb="4" widgetbid="15" widgetaid="11" xmi.id="29" >
       <linepath>
        <startpoint startx="602" starty="450" />

-       <endpoint endx="370" endy="347" />
+       <endpoint endx="370" endy="301" />

       </linepath>
      </UML:AssocWidget>
       </linepath>
      </UML:AssocWidget>

-     <UML:AssocWidget totalcounta="2" indexa="1" totalcountb="3" indexb="1" widgetbid="2" widgetaid="15" xmi.id="30" >
+     <UML:AssocWidget totalcounta="2" indexa="1" totalcountb="5" indexb="3" widgetbid="15" widgetaid="43" xmi.id="44" >

       <linepath>
       <linepath>

-       <startpoint startx="317" starty="290" />
-       <endpoint endx="418" endy="73" />
+       <startpoint startx="415" starty="450" />
+       <endpoint endx="335" endy="301" />

       </linepath>
      </UML:AssocWidget>
       </linepath>
      </UML:AssocWidget>

-     <UML:AssocWidget totalcounta="2" indexa="1" totalcountb="3" indexb="2" widgetbid="2" widgetaid="4" xmi.id="31" >
+     <UML:AssocWidget totalcounta="2" indexa="1" totalcountb="3" indexb="2" widgetbid="51" widgetaid="4" xmi.id="53" >

       <linepath>
       <linepath>

-       <startpoint startx="564" starty="170" />
-       <endpoint endx="466" endy="73" />
+       <startpoint startx="564" starty="168" />
+       <endpoint endx="440" endy="92" />

       </linepath>
      </UML:AssocWidget>
       </linepath>
      </UML:AssocWidget>

-     <UML:AssocWidget totalcounta="2" indexa="1" totalcountb="5" indexb="3" widgetbid="15" widgetaid="43" xmi.id="44" >
+     <UML:AssocWidget totalcounta="2" indexa="1" totalcountb="3" indexb="1" widgetbid="51" widgetaid="15" xmi.id="54" >

       <linepath>
       <linepath>

-       <startpoint startx="415" starty="450" />
-       <endpoint endx="335" endy="347" />
+       <startpoint startx="317" starty="244" />
+       <endpoint endx="392" endy="92" />

       </linepath>
      </UML:AssocWidget>
     </associations>
       </linepath>
      </UML:AssocWidget>
     </associations>


@@ -138,6 +137,9 @@ Maneja muchas conexiones, de control o de transmisión." name="Server" static="0
      <listitem open="0" type="813" id="12" label="Receiver" >
       <listitem open="0" type="815" id="46" label="Receiver" />
      </listitem>
      <listitem open="0" type="813" id="12" label="Receiver" >
       <listitem open="0" type="815" id="46" label="Receiver" />
      </listitem>

+     <listitem open="0" type="813" id="51" label="Runnable" >
+      <listitem open="0" type="815" id="52" label="run" />
+     </listitem>

      <listitem open="0" type="813" id="4" label="Server" >
       <listitem open="0" type="814" id="32" label="controllers" />
       <listitem open="0" type="814" id="23" label="socket" />
      <listitem open="0" type="813" id="4" label="Server" >
       <listitem open="0" type="814" id="32" label="controllers" />
       <listitem open="0" type="814" id="23" label="socket" />


@@ -149,17 +151,12 @@ Maneja muchas conexiones, de control o de transmisión." name="Server" static="0
      <listitem open="0" type="813" id="13" label="Transmitter" >
       <listitem open="0" type="815" id="40" label="Transmitter" />
      </listitem>
      <listitem open="0" type="813" id="13" label="Transmitter" >
       <listitem open="0" type="815" id="40" label="Transmitter" />
      </listitem>

-     <listitem open="0" type="817" id="2" label="Runnable" >
-      <listitem open="0" type="815" id="3" label="run" />
-     </listitem>

     </listitem>
     <listitem open="1" type="802" id="-1" label="Use Case View" />
     <listitem open="1" type="821" id="-1" label="Component View" />
     <listitem open="1" type="827" id="-1" label="Deployment View" />
    </listitem>
   </listview>
     </listitem>
     <listitem open="1" type="802" id="-1" label="Use Case View" />
     <listitem open="1" type="821" id="-1" label="Component View" />
     <listitem open="1" type="827" id="-1" label="Deployment View" />
    </listitem>
   </listview>

-  <codegeneration>
-   <codegenerator language="PHP" />
-  </codegeneration>
+  <codegeneration/>

  </XMI.content>
 </XMI>
  </XMI.content>
 </XMI>