diff --git a/.classpath b/.classpath index 463d5f9..f00af9b 100644 --- a/.classpath +++ b/.classpath @@ -1,6 +1,6 @@ - + diff --git a/.gitignore b/.gitignore new file mode 100644 index 0000000..c17f884 --- /dev/null +++ b/.gitignore @@ -0,0 +1,5 @@ +/bin/ +# Eclipse +.classpath +.project +.settings/ \ No newline at end of file diff --git a/.project b/.project index 890dc8e..1e4b3bb 100644 --- a/.project +++ b/.project @@ -1,6 +1,6 @@ - festival_cine_dta + eedd_festivalcine_ra5 diff --git a/bin/org/lapaloma/dta/festivalcine/vo/Actor.class b/bin/org/lapaloma/dta/festivalcine/vo/Actor.class deleted file mode 100644 index 00fdb46..0000000 Binary files a/bin/org/lapaloma/dta/festivalcine/vo/Actor.class and /dev/null differ diff --git a/bin/org/lapaloma/dta/festivalcine/vo/ActorPelicula.class b/bin/org/lapaloma/dta/festivalcine/vo/ActorPelicula.class deleted file mode 100644 index 0f011d8..0000000 Binary files a/bin/org/lapaloma/dta/festivalcine/vo/ActorPelicula.class and /dev/null differ diff --git a/bin/org/lapaloma/dta/festivalcine/vo/Director.class b/bin/org/lapaloma/dta/festivalcine/vo/Director.class deleted file mode 100644 index 5d0c50d..0000000 Binary files a/bin/org/lapaloma/dta/festivalcine/vo/Director.class and /dev/null differ diff --git a/bin/org/lapaloma/dta/festivalcine/vo/Festival.class b/bin/org/lapaloma/dta/festivalcine/vo/Festival.class deleted file mode 100644 index 9807558..0000000 Binary files a/bin/org/lapaloma/dta/festivalcine/vo/Festival.class and /dev/null differ diff --git a/bin/org/lapaloma/dta/festivalcine/vo/Participante.class b/bin/org/lapaloma/dta/festivalcine/vo/Participante.class deleted file mode 100644 index 31b8cd0..0000000 Binary files a/bin/org/lapaloma/dta/festivalcine/vo/Participante.class and /dev/null differ diff --git a/bin/org/lapaloma/dta/festivalcine/vo/Pelicula.class b/bin/org/lapaloma/dta/festivalcine/vo/Pelicula.class deleted file mode 100644 index 54e1a35..0000000 Binary files a/bin/org/lapaloma/dta/festivalcine/vo/Pelicula.class and /dev/null differ diff --git a/bin/org/lapaloma/dta/festivalcine/vo/PeliculaFestival.class b/bin/org/lapaloma/dta/festivalcine/vo/PeliculaFestival.class deleted file mode 100644 index 09b2cbe..0000000 Binary files a/bin/org/lapaloma/dta/festivalcine/vo/PeliculaFestival.class and /dev/null differ diff --git a/src/org/lapaloma/dta/festivalcine/vo/Director.java b/src/org/lapaloma/dta/festivalcine/vo/Director.java deleted file mode 100644 index 7986bd5..0000000 --- a/src/org/lapaloma/dta/festivalcine/vo/Director.java +++ /dev/null @@ -1,29 +0,0 @@ -package org.lapaloma.dta.festivalcine.vo; - -public class Director extends Participante { - - protected String formacion; - - private Pelicula pelicula; - - public String getFormacion() { - return formacion; - } - - public void setFormacion(String formacion) { - this.formacion = formacion; - } - - public Pelicula getPelicula() { - return pelicula; - } - - public void setPelicula(Pelicula pelicula) { - this.pelicula = pelicula; - } - - - - - -} diff --git a/src/org/lapaloma/dta/festivalcine/vo/Actor.java b/src/org/lapaloma/festivalcine/vo/Actor.java similarity index 55% rename from src/org/lapaloma/dta/festivalcine/vo/Actor.java rename to src/org/lapaloma/festivalcine/vo/Actor.java index d6d4c3f..d03f8c3 100644 --- a/src/org/lapaloma/dta/festivalcine/vo/Actor.java +++ b/src/org/lapaloma/festivalcine/vo/Actor.java @@ -1,10 +1,9 @@ -package org.lapaloma.dta.festivalcine.vo; +package org.lapaloma.festivalcine.vo; public class Actor extends Participante { - + private int nivelIngles; - - private Actor actor; + private Actor padrino; public int getNivelIngles() { return nivelIngles; @@ -14,14 +13,12 @@ public class Actor extends Participante { this.nivelIngles = nivelIngles; } - public Actor getActor() { - return actor; + public Actor getPadrino() { + return padrino; } - public void setActor(Actor actor) { - this.actor = actor; + public void setPadrino(Actor padrino) { + this.padrino = padrino; } - - } diff --git a/src/org/lapaloma/dta/festivalcine/vo/ActorPelicula.java b/src/org/lapaloma/festivalcine/vo/ActorPelicula.java similarity index 91% rename from src/org/lapaloma/dta/festivalcine/vo/ActorPelicula.java rename to src/org/lapaloma/festivalcine/vo/ActorPelicula.java index 0b43e67..4154297 100644 --- a/src/org/lapaloma/dta/festivalcine/vo/ActorPelicula.java +++ b/src/org/lapaloma/festivalcine/vo/ActorPelicula.java @@ -1,31 +1,32 @@ -package org.lapaloma.dta.festivalcine.vo; +package org.lapaloma.festivalcine.vo; public class ActorPelicula { - + private boolean esActorPrincipal; - private Actor actor; private Pelicula pelicula; - + public boolean isEsActorPrincipal() { return esActorPrincipal; } + public void setEsActorPrincipal(boolean esActorPrincipal) { this.esActorPrincipal = esActorPrincipal; } + public Actor getActor() { return actor; } + public void setActor(Actor actor) { this.actor = actor; } + public Pelicula getPelicula() { return pelicula; } + public void setPelicula(Pelicula pelicula) { this.pelicula = pelicula; } - - - } diff --git a/src/org/lapaloma/festivalcine/vo/Director.java b/src/org/lapaloma/festivalcine/vo/Director.java new file mode 100644 index 0000000..b850442 --- /dev/null +++ b/src/org/lapaloma/festivalcine/vo/Director.java @@ -0,0 +1,26 @@ +package org.lapaloma.festivalcine.vo; + +import java.util.List; + +public class Director extends Participante { + + protected String formacion; + private List peliculas; + + public String getFormacion() { + return formacion; + } + + public void setFormacion(String formacion) { + this.formacion = formacion; + } + + public List getPeliculas() { + return peliculas; + } + + public void setPeliculas(List peliculas) { + this.peliculas = peliculas; + } + +} diff --git a/src/org/lapaloma/dta/festivalcine/vo/Festival.java b/src/org/lapaloma/festivalcine/vo/Festival.java similarity index 90% rename from src/org/lapaloma/dta/festivalcine/vo/Festival.java rename to src/org/lapaloma/festivalcine/vo/Festival.java index 439e66f..6b11881 100644 --- a/src/org/lapaloma/dta/festivalcine/vo/Festival.java +++ b/src/org/lapaloma/festivalcine/vo/Festival.java @@ -1,30 +1,32 @@ -package org.lapaloma.dta.festivalcine.vo; +package org.lapaloma.festivalcine.vo; public class Festival { - + private int identificador; private String nombre; private String ciudad; - + public int getIdentificador() { return identificador; } + public void setIdentificador(int identificador) { this.identificador = identificador; } + public String getNombre() { return nombre; } + public void setNombre(String nombre) { this.nombre = nombre; } + public String getCiudad() { return ciudad; } + public void setCiudad(String ciudad) { this.ciudad = ciudad; } - - - } diff --git a/src/org/lapaloma/dta/festivalcine/vo/Participante.java b/src/org/lapaloma/festivalcine/vo/Participante.java similarity index 94% rename from src/org/lapaloma/dta/festivalcine/vo/Participante.java rename to src/org/lapaloma/festivalcine/vo/Participante.java index e2b6564..90e62b5 100644 --- a/src/org/lapaloma/dta/festivalcine/vo/Participante.java +++ b/src/org/lapaloma/festivalcine/vo/Participante.java @@ -1,4 +1,4 @@ -package org.lapaloma.dta.festivalcine.vo; +package org.lapaloma.festivalcine.vo; public abstract class Participante { diff --git a/src/org/lapaloma/dta/festivalcine/vo/Pelicula.java b/src/org/lapaloma/festivalcine/vo/Pelicula.java similarity index 94% rename from src/org/lapaloma/dta/festivalcine/vo/Pelicula.java rename to src/org/lapaloma/festivalcine/vo/Pelicula.java index f15eb9b..f4317da 100644 --- a/src/org/lapaloma/dta/festivalcine/vo/Pelicula.java +++ b/src/org/lapaloma/festivalcine/vo/Pelicula.java @@ -1,9 +1,9 @@ -package org.lapaloma.dta.festivalcine.vo; +package org.lapaloma.festivalcine.vo; import java.util.Date; public class Pelicula { - + private int identificador; private String nombre; private Date anyoFinalizacion; @@ -40,7 +40,5 @@ public class Pelicula { public void setFechaEstreno(Date fechaEstreno) { this.fechaEstreno = fechaEstreno; } - - } diff --git a/src/org/lapaloma/dta/festivalcine/vo/PeliculaFestival.java b/src/org/lapaloma/festivalcine/vo/PeliculaFestival.java similarity index 91% rename from src/org/lapaloma/dta/festivalcine/vo/PeliculaFestival.java rename to src/org/lapaloma/festivalcine/vo/PeliculaFestival.java index 926db33..ddf34b8 100644 --- a/src/org/lapaloma/dta/festivalcine/vo/PeliculaFestival.java +++ b/src/org/lapaloma/festivalcine/vo/PeliculaFestival.java @@ -1,33 +1,35 @@ -package org.lapaloma.dta.festivalcine.vo; +package org.lapaloma.festivalcine.vo; import java.util.Date; public class PeliculaFestival { - + private Date anyoParticipacion; - private Pelicula pelicula; private Festival festival; - + public Date getAnyoPArticipacion() { return anyoParticipacion; } + public void setAnyoPArticipacion(Date anyoPArticipacion) { this.anyoParticipacion = anyoPArticipacion; } + public Pelicula getPelicula() { return pelicula; } + public void setPelicula(Pelicula pelicula) { this.pelicula = pelicula; } + public Festival getFestival() { return festival; } + public void setFestival(Festival festival) { this.festival = festival; } - - }