From a379ac104ea12f66106c19390fa3c318ac07095b Mon Sep 17 00:00:00 2001 From: roche Date: Sun, 17 Nov 2019 17:13:21 +0100 Subject: [PATCH] Corregido grafico y fallos menores --- bin/IniciarSesion/Usuario.class | Bin 828 -> 0 bytes bin/IniciarSesion/Validacion.class | Bin 318 -> 0 bytes doc/AireAcondicionado.html | 281 +++++++++++++++ doc/Alarma.html | 322 ++++++++++++++++++ doc/Ficheros/Configuracion.html | 2 +- doc/Ficheros/class-use/Configuracion.html | 2 +- doc/Ficheros/package-frame.html | 2 +- doc/Ficheros/package-summary.html | 6 +- doc/Ficheros/package-tree.html | 6 +- doc/Ficheros/package-use.html | 2 +- doc/Logica/Gestion.html | 2 +- doc/Logica/Meses.html | 40 ++- doc/Logica/Transaccion.html | 2 +- doc/Logica/class-use/Gestion.html | 2 +- doc/Logica/class-use/Meses.html | 2 +- doc/Logica/class-use/Transaccion.html | 2 +- doc/Logica/package-frame.html | 2 +- doc/Logica/package-summary.html | 6 +- doc/Logica/package-tree.html | 6 +- doc/Logica/package-use.html | 2 +- doc/Main.html | 2 +- doc/VistaControlador/BarraOpciones.html | 2 +- .../ControladorAniadirVisualizar.html | 2 +- doc/VistaControlador/ControladorBarra.html | 2 +- .../ControladorPanelLateral.html | 6 +- doc/VistaControlador/Menu.html | 2 +- doc/VistaControlador/MostrarTodo.html | 2 +- .../VistaAniadirVisualizar.html | 2 +- doc/VistaControlador/VistaPanelLateral.html | 2 +- .../class-use/BarraOpciones.html | 2 +- .../ControladorAniadirVisualizar.html | 2 +- .../class-use/ControladorBarra.html | 2 +- .../class-use/ControladorPanelLateral.html | 2 +- doc/VistaControlador/class-use/Menu.html | 2 +- .../class-use/MostrarTodo.html | 2 +- .../class-use/VistaAniadirVisualizar.html | 2 +- .../class-use/VistaPanelLateral.html | 2 +- doc/VistaControlador/package-frame.html | 2 +- doc/VistaControlador/package-summary.html | 2 +- doc/VistaControlador/package-tree.html | 2 +- doc/VistaControlador/package-use.html | 2 +- doc/allclasses-frame.html | 4 +- doc/allclasses-noframe.html | 4 +- doc/class-use/Main.html | 2 +- doc/constant-values.html | 2 +- doc/deprecated-list.html | 2 +- doc/help-doc.html | 2 +- doc/index-files/index-1.html | 6 +- doc/index-files/index-10.html | 6 +- doc/index-files/index-11.html | 6 +- doc/index-files/index-12.html | 6 +- doc/index-files/index-13.html | 26 +- doc/index-files/index-2.html | 6 +- doc/index-files/index-3.html | 8 +- doc/index-files/index-4.html | 6 +- doc/index-files/index-5.html | 6 +- doc/index-files/index-6.html | 6 +- doc/index-files/index-7.html | 12 +- doc/index-files/index-8.html | 8 +- doc/index-files/index-9.html | 6 +- doc/index.html | 2 +- doc/overview-frame.html | 3 +- doc/overview-summary.html | 8 +- doc/overview-tree.html | 5 +- doc/package-frame.html | 2 +- doc/package-list | 1 - doc/package-summary.html | 2 +- doc/package-tree.html | 2 +- doc/package-use.html | 2 +- doc/serialized-form.html | 31 +- src/IniciarSesion/Usuario.java | 27 -- src/IniciarSesion/Validacion.java | 8 - src/Logica/Meses.java | 14 + .../ControladorPanelLateral.java | 22 +- 74 files changed, 782 insertions(+), 206 deletions(-) delete mode 100644 bin/IniciarSesion/Usuario.class delete mode 100644 bin/IniciarSesion/Validacion.class create mode 100644 doc/AireAcondicionado.html create mode 100644 doc/Alarma.html delete mode 100644 src/IniciarSesion/Usuario.java delete mode 100644 src/IniciarSesion/Validacion.java diff --git a/bin/IniciarSesion/Usuario.class b/bin/IniciarSesion/Usuario.class deleted file mode 100644 index a00334c4f3eca953b47fe872e6bcaf3656023f15..0000000000000000000000000000000000000000 GIT binary patch literal 0 HcmV?d00001 literal 828 zcmZuu%Wl&^6g?9=apSs4o2H>W3Y7AQU4%F6ir63_Aq7~tWRcz29ffI~ahW(Q_!Iu2 z3y=s%EcgIE3UOy_fvR*d_ce3wx%bTPKR5p!9n_}zTLwJbci z44bF?Bad^grt#bKRAi-x7DL}wWf3PrOPk98C6 z1n{tCqH6)#SYzmpq!MoyvsCEgYUJLi$ap@ceNA2$-SWMh6KZs&F0@KJD`w}qNVz7K zD`pNSKJH-O!`({?R#F7GhXYz#d|2?DXf8FVL_P{hm5rq2+1YD;UQgvuMOl9h{lG9> z6^6l2iiOU^OKH9%s9!%ZpMibS!J*S63nL6!7+I_*$;g}g02^dGl;vo^CEt&Jpd0Ni z(Tfh3ls#Tz@RjNf?2;W&N08($b!Zd1L-=j7*Qpv+c-+8E%BYj&Wi~R*4I3G5!+Z;S zHS;mun7eND4THn)xcwPT_rkfLl4D6bc8M(l_K2=;$p#hVA6eHf$8g`GnAz$99@Y#o dc{4|o82Vo*sFrEj;;!u%R1fNY43F%q;a}$#n==3a diff --git a/bin/IniciarSesion/Validacion.class b/bin/IniciarSesion/Validacion.class deleted file mode 100644 index 41e6917160f89d80a2d25f9d31bc9a3e483d9bdb..0000000000000000000000000000000000000000 GIT binary patch literal 0 HcmV?d00001 literal 318 zcmZ{gF;BxV5QX2hAt@oWv=d@u0|vaXQL!K)Aw@8>%I>&^US({_P5EC;l^FN|{3ygF zip0cV`@MIz@3X&uKED9mV3uJ(IDPbNSjUCka`39sj#t`<%#aXHHu_yFr~RvXt~b^+ zgzSaQ+QvW_mtB>EdSGX73F(|YH+O{L#brfE?!(IF7~-fvh7n;>vbRsWx7x;~uAL>! z%3!psbmZ3eVbZL5OE@e4Lz7ndBJ85EZDYCjkNUbr!a0ON9!W9|kakMQF_Pp^oRYPx cUG0&7NH9PlbJ`y`7G3mujEOk;iEh{Q7j@7?n*aa+ diff --git a/doc/AireAcondicionado.html b/doc/AireAcondicionado.html new file mode 100644 index 0000000..a7a2eb0 --- /dev/null +++ b/doc/AireAcondicionado.html @@ -0,0 +1,281 @@ + + + + + +AireAcondicionado + + + + + + + + + + + + +
+

Class AireAcondicionado

+
+
+
    +
  • java.lang.Object
  • +
  • +
      +
    • AireAcondicionado
    • +
    +
  • +
+
+
    +
  • +
    +
    All Implemented Interfaces:
    +
    java.util.Observer
    +
    +
    +
    +
    public class AireAcondicionado
    +extends java.lang.Object
    +implements java.util.Observer
    +
  • +
+
+
+
    +
  • + +
      +
    • + + +

      Constructor Summary

      + + + + + + + + +
      Constructors 
      Constructor and Description
      AireAcondicionado(int temperatura) 
      +
    • +
    + +
      +
    • + + +

      Method Summary

      + + + + + + + + + + +
      All Methods Instance Methods Concrete Methods 
      Modifier and TypeMethod and Description
      voidupdate(java.util.Observable o, + java.lang.Object arg) 
      +
        +
      • + + +

        Methods inherited from class java.lang.Object

        +equals, getClass, hashCode, notify, notifyAll, toString, wait, wait, wait
      • +
      +
    • +
    +
  • +
+
+
+
    +
  • + +
      +
    • + + +

      Constructor Detail

      + + + +
        +
      • +

        AireAcondicionado

        +
        public AireAcondicionado(int temperatura)
        +
      • +
      +
    • +
    + +
      +
    • + + +

      Method Detail

      + + + +
        +
      • +

        update

        +
        public void update(java.util.Observable o,
        +                   java.lang.Object arg)
        +
        +
        Specified by:
        +
        update in interface java.util.Observer
        +
        +
      • +
      +
    • +
    +
  • +
+
+
+ + + + + + + diff --git a/doc/Alarma.html b/doc/Alarma.html new file mode 100644 index 0000000..e98abd2 --- /dev/null +++ b/doc/Alarma.html @@ -0,0 +1,322 @@ + + + + + +Alarma + + + + + + + + + + + + +
+

Class Alarma

+
+
+
    +
  • java.lang.Object
  • +
  • +
      +
    • java.lang.Thread
    • +
    • +
        +
      • Alarma
      • +
      +
    • +
    +
  • +
+
+
    +
  • +
    +
    All Implemented Interfaces:
    +
    java.lang.Runnable
    +
    +
    +
    +
    public class Alarma
    +extends java.lang.Thread
    +
  • +
+
+
+
    +
  • + +
      +
    • + + +

      Nested Class Summary

      +
        +
      • + + +

        Nested classes/interfaces inherited from class java.lang.Thread

        +java.lang.Thread.State, java.lang.Thread.UncaughtExceptionHandler
      • +
      +
    • +
    + +
      +
    • + + +

      Field Summary

      +
        +
      • + + +

        Fields inherited from class java.lang.Thread

        +MAX_PRIORITY, MIN_PRIORITY, NORM_PRIORITY
      • +
      +
    • +
    + +
      +
    • + + +

      Constructor Summary

      + + + + + + + + +
      Constructors 
      Constructor and Description
      Alarma(int tiempo) 
      +
    • +
    + +
      +
    • + + +

      Method Summary

      + + + + + + + + + + +
      All Methods Instance Methods Concrete Methods 
      Modifier and TypeMethod and Description
      voidrun() 
      +
        +
      • + + +

        Methods inherited from class java.lang.Thread

        +activeCount, checkAccess, countStackFrames, currentThread, destroy, dumpStack, enumerate, getAllStackTraces, getContextClassLoader, getDefaultUncaughtExceptionHandler, getId, getName, getPriority, getStackTrace, getState, getThreadGroup, getUncaughtExceptionHandler, holdsLock, interrupt, interrupted, isAlive, isDaemon, isInterrupted, join, join, join, resume, setContextClassLoader, setDaemon, setDefaultUncaughtExceptionHandler, setName, setPriority, setUncaughtExceptionHandler, sleep, sleep, start, stop, stop, suspend, toString, yield
      • +
      +
        +
      • + + +

        Methods inherited from class java.lang.Object

        +equals, getClass, hashCode, notify, notifyAll, wait, wait, wait
      • +
      +
    • +
    +
  • +
+
+
+
    +
  • + +
      +
    • + + +

      Constructor Detail

      + + + +
        +
      • +

        Alarma

        +
        public Alarma(int tiempo)
        +
      • +
      +
    • +
    + +
      +
    • + + +

      Method Detail

      + + + +
        +
      • +

        run

        +
        public void run()
        +
        +
        Specified by:
        +
        run in interface java.lang.Runnable
        +
        Overrides:
        +
        run in class java.lang.Thread
        +
        +
      • +
      +
    • +
    +
  • +
+
+
+ + + + + + + diff --git a/doc/Ficheros/Configuracion.html b/doc/Ficheros/Configuracion.html index 475b01c..01c749c 100644 --- a/doc/Ficheros/Configuracion.html +++ b/doc/Ficheros/Configuracion.html @@ -2,7 +2,7 @@ - + Configuracion diff --git a/doc/Ficheros/class-use/Configuracion.html b/doc/Ficheros/class-use/Configuracion.html index 4e3acf8..d86ec9f 100644 --- a/doc/Ficheros/class-use/Configuracion.html +++ b/doc/Ficheros/class-use/Configuracion.html @@ -2,7 +2,7 @@ - + Uses of Class Ficheros.Configuracion diff --git a/doc/Ficheros/package-frame.html b/doc/Ficheros/package-frame.html index be79405..10cb7c3 100644 --- a/doc/Ficheros/package-frame.html +++ b/doc/Ficheros/package-frame.html @@ -2,7 +2,7 @@ - + Ficheros diff --git a/doc/Ficheros/package-summary.html b/doc/Ficheros/package-summary.html index f1e5801..782ee92 100644 --- a/doc/Ficheros/package-summary.html +++ b/doc/Ficheros/package-summary.html @@ -2,7 +2,7 @@ - + Ficheros @@ -44,7 +44,7 @@