diff --git a/1.sources/MyHealth/.settings/org.eclipse.jdt.core.prefs b/1.sources/MyHealth/.settings/org.eclipse.jdt.core.prefs index 2c1391e..5caa538 100644 --- a/1.sources/MyHealth/.settings/org.eclipse.jdt.core.prefs +++ b/1.sources/MyHealth/.settings/org.eclipse.jdt.core.prefs @@ -1,13 +1,13 @@ eclipse.preferences.version=1 org.eclipse.jdt.core.compiler.codegen.inlineJsrBytecode=enabled org.eclipse.jdt.core.compiler.codegen.methodParameters=do not generate -org.eclipse.jdt.core.compiler.codegen.targetPlatform=1.6 +org.eclipse.jdt.core.compiler.codegen.targetPlatform=1.8 org.eclipse.jdt.core.compiler.codegen.unusedLocal=preserve -org.eclipse.jdt.core.compiler.compliance=1.6 +org.eclipse.jdt.core.compiler.compliance=1.8 org.eclipse.jdt.core.compiler.debug.lineNumber=generate org.eclipse.jdt.core.compiler.debug.localVariable=generate org.eclipse.jdt.core.compiler.debug.sourceFile=generate org.eclipse.jdt.core.compiler.problem.assertIdentifier=error org.eclipse.jdt.core.compiler.problem.enumIdentifier=error org.eclipse.jdt.core.compiler.release=disabled -org.eclipse.jdt.core.compiler.source=1.6 +org.eclipse.jdt.core.compiler.source=1.8 diff --git a/1.sources/MyHealth/src/TO/PatientTO.java b/1.sources/MyHealth/src/TO/PatientTO.java index 7cd78ca..fb7ae45 100644 --- a/1.sources/MyHealth/src/TO/PatientTO.java +++ b/1.sources/MyHealth/src/TO/PatientTO.java @@ -4,8 +4,6 @@ import java.io.Serializable; import javax.xml.bind.annotation.XmlRootElement; -import jpa.FamilyDoctorJPA; - /** * * @author Marcos García Núñez (mgarcianun@uoc.edu) diff --git a/1.sources/MyHealth/src/ejb/common/CommonFacadeRemote.java b/1.sources/MyHealth/src/ejb/common/CommonFacadeRemote.java index e386ac8..533669e 100644 --- a/1.sources/MyHealth/src/ejb/common/CommonFacadeRemote.java +++ b/1.sources/MyHealth/src/ejb/common/CommonFacadeRemote.java @@ -1,6 +1,5 @@ package ejb.common; -import java.util.Collection; import java.util.List; import javax.ejb.Remote; @@ -10,9 +9,6 @@ import TO.MedicalSpecialtyTO; import TO.PatientTO; import TO.PrimaryHealthCareCenterTO; import TO.SpecialistDoctorTO; -import jpa.FamilyDoctorJPA; -import jpa.PatientJPA; -import jpa.SpecialistDoctorJPA; /** * diff --git a/1.sources/MyHealth/src/ejb/profile/ProfileFacadeBean.java b/1.sources/MyHealth/src/ejb/profile/ProfileFacadeBean.java index ae8cba6..91ba814 100644 --- a/1.sources/MyHealth/src/ejb/profile/ProfileFacadeBean.java +++ b/1.sources/MyHealth/src/ejb/profile/ProfileFacadeBean.java @@ -278,8 +278,6 @@ public class ProfileFacadeBean implements ProfileFacadeRemote { * @return FamilyDoctorTO (Transfer Object del médico de familia al que se la ha cambiado el CAP). */ public FamilyDoctorTO changePrimaryHealthCareCenter(int professionalId, PrimaryHealthCareCenterTO newCenter) throws Exception { - FamilyDoctorTO fdTO = null; - FamilyDoctorJPA fd = entman.find(FamilyDoctorJPA.class, professionalId); if (fd == null) { throw new Exception("No se encuentra en la base de datos ningún médico de familia con id: " + String.valueOf(professionalId)); diff --git a/1.sources/MyHealth/src/ejb/systemAdmin/SystemAdminFacadeBean.java b/1.sources/MyHealth/src/ejb/systemAdmin/SystemAdminFacadeBean.java index f0b239f..00c7a0f 100644 --- a/1.sources/MyHealth/src/ejb/systemAdmin/SystemAdminFacadeBean.java +++ b/1.sources/MyHealth/src/ejb/systemAdmin/SystemAdminFacadeBean.java @@ -16,7 +16,6 @@ import common.UserType; import ejb.common.CommonFacadeLocal; import jpa.AdministratorJPA; import jpa.MedicalSpecialtyJPA; -import jpa.PatientJPA; /** * diff --git a/1.sources/MyHealth/src/ejb/systemAdmin/SystemAdminFacadeRemote.java b/1.sources/MyHealth/src/ejb/systemAdmin/SystemAdminFacadeRemote.java index 7c8cfe9..13c32f3 100644 --- a/1.sources/MyHealth/src/ejb/systemAdmin/SystemAdminFacadeRemote.java +++ b/1.sources/MyHealth/src/ejb/systemAdmin/SystemAdminFacadeRemote.java @@ -1,13 +1,9 @@ package ejb.systemAdmin; -import java.util.Collection; - import javax.ejb.Remote; import TO.LoggedUserTO; import TO.MedicalSpecialtyTO; -import TO.PatientTO; -import TO.PrimaryHealthCareCenterTO; /** * diff --git a/1.sources/MyHealth/src/managedbean/common/MenuMBean.java b/1.sources/MyHealth/src/managedbean/common/MenuMBean.java index 677bf44..341963d 100644 --- a/1.sources/MyHealth/src/managedbean/common/MenuMBean.java +++ b/1.sources/MyHealth/src/managedbean/common/MenuMBean.java @@ -4,8 +4,6 @@ import java.io.Serializable; import javax.annotation.PostConstruct; import javax.enterprise.context.RequestScoped; -import javax.faces.application.FacesMessage; -import javax.faces.context.FacesContext; import javax.inject.Named; import org.primefaces.model.menu.DefaultMenuItem; diff --git a/1.sources/MyHealth/src/managedbean/common/ThemeService.java b/1.sources/MyHealth/src/managedbean/common/ThemeService.java index de7c7d5..9b19661 100644 --- a/1.sources/MyHealth/src/managedbean/common/ThemeService.java +++ b/1.sources/MyHealth/src/managedbean/common/ThemeService.java @@ -1,16 +1,16 @@ package managedbean.common; +import java.io.Serializable; import java.util.ArrayList; import java.util.List; -public class ThemeService { - /** - * - */ +public class ThemeService implements Serializable { private static final long serialVersionUID = 1L; public static final String DEFAULT_THEME = "nova-light"; public static final List THEMES = new ArrayList() { + private static final long serialVersionUID = 1L; + { int i = 1; add(new Theme(i++, "afterdark", "afterdark")); diff --git a/1.sources/MyHealth/src/managedbean/medicalTest/PendingQuestionsMBean.java b/1.sources/MyHealth/src/managedbean/medicalTest/PendingQuestionsMBean.java index 04fc7c9..b170a9b 100644 --- a/1.sources/MyHealth/src/managedbean/medicalTest/PendingQuestionsMBean.java +++ b/1.sources/MyHealth/src/managedbean/medicalTest/PendingQuestionsMBean.java @@ -12,8 +12,6 @@ import org.primefaces.model.LazyDataModel; import org.primefaces.model.SortOrder; import TO.QuestionTO; -import common.Constants; -import ejb.medicalTest.MedicalTestFacadeRemote; import managedbean.common.ManagedBeanBase; import managedbean.common.SessionUtils; diff --git a/1.sources/MyHealth/src/managedbean/profile/ChangePrimaryHealthCareCenterMBean.java b/1.sources/MyHealth/src/managedbean/profile/ChangePrimaryHealthCareCenterMBean.java index bc1e28f..8235389 100644 --- a/1.sources/MyHealth/src/managedbean/profile/ChangePrimaryHealthCareCenterMBean.java +++ b/1.sources/MyHealth/src/managedbean/profile/ChangePrimaryHealthCareCenterMBean.java @@ -1,7 +1,6 @@ package managedbean.profile; import java.io.Serializable; -import java.util.Collection; import java.util.List; import javax.annotation.PostConstruct; diff --git a/1.sources/MyHealth/src/managedbean/systemAdmin/LoginMBean.java b/1.sources/MyHealth/src/managedbean/systemAdmin/LoginMBean.java index 29d8c08..5674f25 100644 --- a/1.sources/MyHealth/src/managedbean/systemAdmin/LoginMBean.java +++ b/1.sources/MyHealth/src/managedbean/systemAdmin/LoginMBean.java @@ -1,19 +1,12 @@ package managedbean.systemAdmin; -import java.util.Properties; - import javax.enterprise.context.RequestScoped; import javax.faces.application.FacesMessage; -import javax.faces.context.FacesContext; import javax.inject.Named; -import javax.naming.Context; -import javax.naming.InitialContext; -import javax.servlet.http.HttpSession; import org.primefaces.PrimeFaces; import TO.LoggedUserTO; -import ejb.systemAdmin.SystemAdminFacadeRemote; import managedbean.common.ManagedBeanBase; import managedbean.common.SessionUtils; diff --git a/1.sources/MyHealth/src/managedbean/systemAdmin/ManageSpecialitiesMBean.java b/1.sources/MyHealth/src/managedbean/systemAdmin/ManageSpecialitiesMBean.java index 8a12fc3..efbd50d 100644 --- a/1.sources/MyHealth/src/managedbean/systemAdmin/ManageSpecialitiesMBean.java +++ b/1.sources/MyHealth/src/managedbean/systemAdmin/ManageSpecialitiesMBean.java @@ -6,7 +6,6 @@ import java.util.List; import javax.annotation.PostConstruct; import javax.enterprise.context.RequestScoped; import javax.faces.application.FacesMessage; -import javax.faces.context.FacesContext; import javax.inject.Named; import TO.LoggedUserTO; diff --git a/1.sources/MyHealth/src/managedbean/validators/EmailValidator.java b/1.sources/MyHealth/src/managedbean/validators/EmailValidator.java index f6d2fcc..b866476 100644 --- a/1.sources/MyHealth/src/managedbean/validators/EmailValidator.java +++ b/1.sources/MyHealth/src/managedbean/validators/EmailValidator.java @@ -14,12 +14,12 @@ import javax.faces.validator.ValidatorException; import org.primefaces.validate.ClientValidator; @FacesValidator("emailValidator") -public class EmailValidator implements Validator, ClientValidator { +public class EmailValidator implements Validator, ClientValidator { private final static String EMAIL_PATTERN = "^[_A-Za-z0-9-\\+]+(\\.[_A-Za-z0-9-]+)*@[A-Za-z0-9-]+(\\.[A-Za-z0-9]+)*(\\.[A-Za-z]{2,})$"; private final static Pattern EMAIL_COMPILED_PATTERN = Pattern.compile(EMAIL_PATTERN); - public void validate(FacesContext context, UIComponent comp, Object value) throws ValidatorException { + public void validate(FacesContext context, UIComponent comp, String value) throws ValidatorException { String strValue = ""; if (value != null) diff --git a/1.sources/MyHealth/src/managedbean/validators/NifValidator.java b/1.sources/MyHealth/src/managedbean/validators/NifValidator.java index c663919..e0ad8dc 100644 --- a/1.sources/MyHealth/src/managedbean/validators/NifValidator.java +++ b/1.sources/MyHealth/src/managedbean/validators/NifValidator.java @@ -14,9 +14,9 @@ import org.primefaces.validate.ClientValidator; import managedbean.common.ValidationUtils; @FacesValidator("nifValidator") -public class NifValidator implements Validator, ClientValidator { +public class NifValidator implements Validator, ClientValidator { - public void validate(FacesContext context, UIComponent comp, Object value) throws ValidatorException { + public void validate(FacesContext context, UIComponent comp, String value) throws ValidatorException { String strValue = ""; if (value != null)